Changeset 337

Timestamp:

2006-12-17T04:20:43+01:00 (6 years ago)

Author:

moo

Message:

1.2->trunk: [334] robust error handling on shm init

Location:

trunk

Files:

• . (modified) (1 prop)
• mmap.c (modified) (2 diffs)
• xcache.c (modified) (5 diffs)

trunk/mmap.c

@@ -176 +176 @@
         if (strncmp(shm->name, "/dev", 4) == 0) {
             perror(shm->name);
-            errstr = "Cannot open file set by xcache.mmap_path";
+            errstr = "Cannot open file set by xcache.mmap_path, check the xcache.size/var_size against system limitation";
             goto err;
         }
@@ -183 +183 @@
         if (fd == -1) {
             perror(shm->name);
-            errstr = "Cannot open or create file set by xcache.mmap_path";
+            errstr = "Cannot open or create file set by xcache.mmap_path, check the path permission or check xcache.size/var_size against system limitation";
             goto err;
         }

trunk/xcache.c

@@ -1541 +1541 @@
         xc_php_caches = NULL;
     }
+    xc_php_hcache.size = 0;
+
     if (xc_var_caches) {
         shm = xc_cache_destroy(xc_var_caches, &xc_var_hcache);
         xc_var_caches = NULL;
     }
+    xc_var_hcache.size = 0;
+    fprintf(stderr, "set 0\n");
+
     if (shm) {
         xc_shm_destroy(shm);
     }
+
+    xc_initized = 0;
 }
 /* }}} */
@@ -1553 +1560 @@
 {
     xc_shm_t *shm;
+    xc_shmsize_t shmsize = ALIGN(xc_php_size) + ALIGN(xc_var_size);
 
     xc_php_caches = xc_var_caches = NULL;
+    shm = NULL;
+
+    if (shmsize < (size_t) xc_php_size || shmsize < (size_t) xc_var_size) {
+        zend_error(E_ERROR, "XCache: neither xcache.size nor xcache.var_size can be negative");
+        goto err;
+    }
 
     if (xc_php_size || xc_var_size) {
-        CHECK(shm = xc_shm_init(xc_shm_scheme, ALIGN(xc_php_size) + ALIGN(xc_var_size), xc_readonly_protection, xc_mmap_path, NULL), "Cannot create shm");
+        CHECK(shm = xc_shm_init(xc_shm_scheme, shmsize, xc_readonly_protection, xc_mmap_path, NULL), "Cannot create shm");
         if (!shm->handlers->can_readonly(shm)) {
             xc_readonly_protection = 0;
@@ -1573 +1587 @@
         }
     }
-    return 1;
+    return SUCCESS;
 
 err:
+    xc_destroy();
     if (xc_php_caches || xc_var_caches) {
-        xc_destroy();
-        /* shm destroied */
+        /* shm destroied in xc_destroy() */
     }
     else if (shm) {
@@ -2678 +2692 @@
 
     if ((xc_php_size || xc_var_size) && xc_mmap_path && xc_mmap_path[0]) {
-        if (!xc_init(module_number TSRMLS_CC)) {
+        if (xc_init(module_number TSRMLS_CC) != SUCCESS) {
             zend_error(E_ERROR, "XCache: Cannot init");
             goto err_init;
@@ -2700 +2714 @@
     if (xc_initized) {
         xc_destroy();
-        xc_initized = 0;
     }
     if (xc_mmap_path) {