Changeset 21 for trunk

Timestamp:

05/25/2006 04:39:16 AM (7 years ago)

Author:

moo

Message:

friendly anonymous mmap name for win32

Location:

trunk

Files:

• mmap.c (modified) (2 diffs)
• xcache.c (modified) (4 diffs)

trunk/mmap.c

@@ -138 +138 @@
 xc_shm_t *xc_shm_init(const char *path, xc_shmsize_t size, zend_bool readonly_protection) /* {{{ */
 {
+#ifdef ZEND_WIN32
+#   define TMP_PATH "XCache"
+#else
+#   define TMP_PATH "/tmp/XCache"
+#endif
     xc_shm_t *shm = NULL;
     int fd = -1;
     int ro_ok;
     volatile void *romem;
-    char tmpname[sizeof("/tmp/xcache") - 1 + 100];
+    char tmpname[sizeof(TMP_PATH) - 1 + 100];
 
     CHECK(shm = calloc(1, sizeof(xc_shm_t)), "shm OOM");
@@ -149 +154 @@
     if (path == NULL || !path[0]) {
         static int inc = 0;
-        snprintf(tmpname, sizeof(tmpname) - 1, "/tmp/xcache.%d.%d.%d", (int) getuid(), inc ++, rand());
+        snprintf(tmpname, sizeof(tmpname) - 1, "%s.%d.%d.%d", TMP_PATH, (int) getuid(), inc ++, rand());
         path = tmpname;
     }

trunk/xcache.c

@@ -1712 +1712 @@
 #endif
 
+#ifdef ZEND_WIN32
+#   define DEFAULT_PATH "xcache"
+#else
+#   define DEFAULT_PATH "/dev/zero"
+#endif
 PHP_INI_BEGIN()
     PHP_INI_ENTRY1     ("xcache.size",                   "0", PHP_INI_SYSTEM, xc_OnUpdateLong,     &xc_php_size)
@@ -1721 +1726 @@
     PHP_INI_ENTRY1     ("xcache.var_slots",             "8K", PHP_INI_SYSTEM, xc_OnUpdateHashInfo, &xc_var_hentry)
 
-    PHP_INI_ENTRY1     ("xcache.mmap_path",      "/dev/zero", PHP_INI_SYSTEM, xc_OnUpdateString,   &xc_mmap_path)
+    PHP_INI_ENTRY1     ("xcache.mmap_path",     DEFAULT_PATH, PHP_INI_SYSTEM, xc_OnUpdateString,   &xc_mmap_path)
     PHP_INI_ENTRY1     ("xcache.coredump_directory",      "", PHP_INI_SYSTEM, xc_OnUpdateString,   &xc_coredump_dir)
     PHP_INI_ENTRY1     ("xcache.test",                   "0", PHP_INI_SYSTEM, xc_OnUpdateBool,     &xc_test)
@@ -1821 +1826 @@
     if ((xc_php_size || xc_var_size) && xc_mmap_path && xc_mmap_path[0]) {
         if (!xc_init(module_number TSRMLS_CC)) {
-            zend_error(E_ERROR, "XCache: Cannot init xcache");
+            zend_error(E_ERROR, "XCache: Cannot init");
             goto err_init;
         }
@@ -1892 +1897 @@
 zend_module_entry xcache_module_entry = {
     STANDARD_MODULE_HEADER,
-    "xcache",
+    "XCache",
     xcache_functions,
     PHP_MINIT(xcache),