Changeset 57

Timestamp:

06/02/2006 01:55:05 AM (2 years ago)

Author:

moo

Message:

never unlink the file not created by XCache

Files:

• trunk/mmap.c (modified) (6 diffs)

trunk/mmap.c

@@ -12 +12 @@
 #   define ftruncate chsize
 #   define getuid() 0
-#   define XcacheCreateFileMapping(size, perm, name) \
+#   define XCacheCreateFileMapping(size, perm, name) \
         CreateFileMapping(INVALID_HANDLE_VALUE, NULL, perm, (sizeof(xc_shmsize_t) > 4) ? size >> 32 : 0, size & 0xffffffff, name)
 #   define XCACHE_MAP_FAILED NULL
@@ -43 +43 @@
     xc_shmsize_t size;
     char *name;
+    int newfile;
 #ifdef ZEND_WIN32
     HANDLE hmap;
@@ -123 +124 @@
     if (shm->name) {
 #ifdef __CYGWIN__
-        unlink(shm->name);
+        if (shm->newfile) {
+            unlink(shm->name);
+        }
 #endif
         free(shm->name);
@@ -165 +168 @@
     if (fd == -1) {
         fd = open(shm->name, O_CREAT | O_RDWR, XCACHE_MMAP_PERMISSION);
+        shm->newfile = 1;
         if (fd == -1) {
             goto err;
         }
     }
+    if (strncmp(shm->name, "/tmp", 4) == 0) {
+        shm->newfile = 0;
+    }
     ftruncate(fd, size);
 #endif
 
 #ifdef ZEND_WIN32
-    shm->hmap = XcacheCreateFileMapping(size, PAGE_READWRITE, shm->name);
+    shm->hmap = XCacheCreateFileMapping(size, PAGE_READWRITE, shm->name);
     shm->ptr = (LPSTR) MapViewOfFile(shm->hmap, FILE_MAP_WRITE, 0, 0, 0);
 #else
@@ -187 +194 @@
     if (readonly_protection) {
 #ifdef ZEND_WIN32
-        shm->hmap_ro = XcacheCreateFileMapping(size, PAGE_READONLY, shm->name);
+        shm->hmap_ro = XCacheCreateFileMapping(size, PAGE_READONLY, shm->name);
         shm->ptr_ro = (LPSTR) MapViewOfFile(shm->hmap_ro, FILE_MAP_READ, 0, 0, 0);
 #else
@@ -226 +233 @@
     close(fd);
 #ifndef __CYGWIN__
-    unlink(shm->name);
+    if (shm->newfile) {
+        unlink(shm->name);
+    }
 #endif