Changeset 79

Timestamp:

2006-06-16T02:50:51+02:00 (7 years ago)

Author:

moo

Message:

fix messy XCACHE_MAP_FAILED checking

File:

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

trunk/mmap.c

@@ -18 +18 @@
 #else
 #   include <unistd.h>
+/* make sure to mark(change) it to NULL to keep consistent */
 #   define XCACHE_MAP_FAILED MAP_FAILED
 #endif
@@ -192 +193 @@
     }
 
-    ro_ok = 0;
+    /* {{{ readonly protection, mmap it readonly and check if ptr_ro works */
     if (readonly_protection) {
+        ro_ok = 0;
+
 #ifdef ZEND_WIN32
         shm->hmap_ro = XCacheCreateFileMapping(size, PAGE_READONLY, shm->name);
@@ -200 +203 @@
         shm->ptr_ro = mmap(NULL, size, PROT_READ, MAP_SHARED, fd, 0);
 #endif
+        if (shm->ptr_ro == XCACHE_MAP_FAILED) {
+            shm->ptr_ro = NULL;
+        }
         romem = shm->ptr_ro;
 
-        /* {{{ check if ptr_ro works */
         do {
-            if (shm->ptr_ro == XCACHE_MAP_FAILED || shm->ptr_ro == shm->ptr) {
+            if (romem == NULL || romem == shm->ptr) {
                 break;
             }
@@ -217 +222 @@
             ro_ok = 1;
         } while (0);
-    }
-
-    if (ro_ok) {
-        shm->diff = PTR_SUB(shm->ptr_ro, (char *) shm->ptr);
-        assert(abs(shm->diff) >= size);
-    }
-    else {
-        if (shm->ptr_ro != XCACHE_MAP_FAILED) {
-            munmap(shm->ptr_ro, size);
-        }
-        shm->ptr_ro = NULL;
-        shm->diff = 0;
-    }
+
+        if (ro_ok) {
+            shm->diff = PTR_SUB(shm->ptr_ro, (char *) shm->ptr);
+            /* no overlap */
+            assert(abs(shm->diff) >= size);
+        }
+        else {
+            if (shm->ptr_ro) {
+                munmap(shm->ptr_ro, size);
+            }
+#ifdef ZEND_WIN32
+            if (shm->hmap_ro) {
+                CloseHandle(shm->hmap_ro);
+            }
+#endif
+            shm->ptr_ro = NULL;
+            shm->diff = 0;
+        }
+    }
+
     /* }}} */