← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/mf_cache.c

  • Committer: Monty Taylor
  • Date: 2008-07-22 05:48:51 UTC
  • mto: (202.1.3 toru)
  • mto: This revision was merged to the branch mainline in revision 204.
  • Revision ID: monty@inaugust.com-20080722054851-airxt73370725p7x
Re-enabled optimizations for the normal build, and added back the --with-debug option to turn them off. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/mf_cache.c
16
16
/* Open a temporary file and cache it with io_cache. Delete it on close */
17
17
 
18
18
#include "mysys_priv.h"
19
 
#include <mystrings/m_string.h>
20
 
#include <mysys/my_static.h>
21
 
#include <mysys/mysys_err.h>
22
 
#include <mysys/iocache.h>
23
 
 
 
19
#include <m_string.h>
 
20
#include "my_static.h"
 
21
#include "mysys_err.h"
 
22
 
 
23
        /*
 
24
          Remove an open tempfile so that it doesn't survive
 
25
          if we crash;  If the operating system doesn't support
 
26
          this, just remember the file name for later removal
 
27
        */
 
28
 
 
29
static bool cache_remove_open_tmp(IO_CACHE *cache __attribute__((unused)),
 
30
                                     const char *name)
 
31
{
 
32
#if O_TEMPORARY == 0
 
33
#if !defined(CANT_DELETE_OPEN_FILES)
 
34
  /* The following should always succeed */
 
35
  (void) my_delete(name,MYF(MY_WME | ME_NOINPUT));
 
36
#else
 
37
  int length;
 
38
  if (!(cache->file_name=
 
39
        (char*) my_malloc((length=strlen(name)+1),MYF(MY_WME))))
 
40
  {
 
41
    my_close(cache->file,MYF(0));
 
42
    cache->file = -1;
 
43
    errno=my_errno=ENOMEM;
 
44
    return 1;
 
45
  }
 
46
  memcpy(cache->file_name,name,length);
 
47
#endif
 
48
#endif /* O_TEMPORARY == 0 */
 
49
  return 0;
 
50
}
24
51
 
25
52
        /*
26
53
        ** Open tempfile cached by IO_CACHE
43
70
  {
44
71
    return(0);
45
72
  }
46
 
  free(cache->dir);
47
 
  free(cache->prefix);
 
73
  my_free(cache->dir,   MYF(MY_ALLOW_ZERO_PTR));
 
74
  my_free(cache->prefix,MYF(MY_ALLOW_ZERO_PTR));
48
75
  return(1);
49
76
}
50
77
 
55
82
  char name_buff[FN_REFLEN];
56
83
  int error=1;
57
84
  if ((cache->file=create_temp_file(name_buff, cache->dir, cache->prefix,
58
 
                                    (O_RDWR | O_TRUNC),
 
85
                                    (O_RDWR | O_BINARY | O_TRUNC |
 
86
                                     O_TEMPORARY | O_SHORT_LIVED),
59
87
                                    MYF(MY_WME))) >= 0)
60
88
  {
61
89
    error=0;
62
 
    my_delete(name_buff,MYF(MY_WME | ME_NOINPUT));
 
90
    cache_remove_open_tmp(cache, name_buff);
63
91
  }
64
92
  return(error);
65
93
}
79
107
      if (cache->file_name)
80
108
      {
81
109
        (void) my_delete(cache->file_name,MYF(MY_WME | ME_NOINPUT));
82
 
        free(cache->file_name);
 
110
        my_free(cache->file_name,MYF(0));
83
111
      }
84
112
#endif
85
113
    }
86
 
    free(cache->dir);
87
 
    free(cache->prefix);
 
114
    my_free(cache->dir,MYF(MY_ALLOW_ZERO_PTR));
 
115
    my_free(cache->prefix,MYF(MY_ALLOW_ZERO_PTR));
88
116
  }
89
117
  return;
90
118
}