Changeset 929 for trunk/xcache.c

Timestamp:

06/26/2012 11:21:13 AM (11 months ago)

Author:

moo

Message:

xc_resolve_path for better name. call util/coverager destroy first

Files:

• trunk/xcache.c (modified) (11 diffs)

trunk/xcache.c

@@ -912 +912 @@
 /* }}} */
 
-#define XC_INCLUDE_PATH_XSTAT_FUNC(name) zend_bool name(const char *filepath, size_t filepath_len, void *data TSRMLS_DC)
-typedef XC_INCLUDE_PATH_XSTAT_FUNC((*include_path_xstat_func_t));
-static zend_bool xc_include_path_apply(const char *filepath, char *path_buffer, include_path_xstat_func_t xstat_func, void *data TSRMLS_DC) /* {{{ */
+#define XC_RESOLVE_PATH_CHECKER(name) zend_bool name(const char *filepath, size_t filepath_len, void *data TSRMLS_DC)
+typedef XC_RESOLVE_PATH_CHECKER((*xc_resolve_path_checker_func_t));
+static zend_bool xc_resolve_path(const char *filepath, char *path_buffer, xc_resolve_path_checker_func_t checker_func, void *data TSRMLS_DC) /* {{{ */
 {
     char *paths, *path;
     char *tokbuf;
     size_t path_buffer_len;
-    int size = strlen(PG(include_path)) + 1;
+    int size;
     char tokens[] = { DEFAULT_DIR_SEPARATOR, '\0' };
     int ret;
     ALLOCA_FLAG(use_heap)
 
+#if 0
+    if ((*filepath == '.' && 
+         (IS_SLASH(filepath[1]) || 
+          ((filepath[1] == '.') && IS_SLASH(filepath[2])))) ||
+        IS_ABSOLUTE_PATH(filepath, strlen(filepath)) ||
+        !path ||
+        !*path) {
+
+        if (checker_func(path_buffer, path_buffer_len, data TSRMLS_CC)) {
+            ret = 1;
+        }
+        else {
+            ret = FAILURE;
+        }
+        goto finish;
+    }
+#endif
+
+    size = strlen(PG(include_path)) + 1;
     paths = (char *)my_do_alloca(size, use_heap);
     memcpy(paths, PG(include_path), size);
@@ -930 +949 @@
         path_buffer_len = snprintf(path_buffer, MAXPATHLEN, "%s/%s", path, filepath);
         if (path_buffer_len < MAXPATHLEN - 1) {
-            if (xstat_func(path_buffer, path_buffer_len, data TSRMLS_CC)) {
+            if (checker_func(path_buffer, path_buffer_len, data TSRMLS_CC)) {
                 ret = 1;
                 goto finish;
@@ -952 +971 @@
                         path_buffer_len = dirname_len + filename_len;
                         path_buffer[path_buffer_len] = '\0';
-                        if (xstat_func(path_buffer, path_buffer_len, data TSRMLS_CC) == 0) {
+                        if (checker_func(path_buffer, path_buffer_len, data TSRMLS_CC) == 0) {
                             ret = 1;
                             goto finish;
@@ -972 +991 @@
 /* }}} */
 #ifndef ZEND_ENGINE_2_3
-static XC_INCLUDE_PATH_XSTAT_FUNC(xc_stat_file) /* {{{ */
+static XC_RESOLVE_PATH_CHECKER(xc_stat_file) /* {{{ */
 {
     return VCWD_STAT(filepath, (struct stat *) data) == 0 ? 1 : 0;
 }
 /* }}} */
-static int xc_include_path_stat(const char *filepath, char *path_buffer, struct stat *pbuf TSRMLS_DC) /* {{{ */
-{
-    return xc_include_path_apply(filepath, path_buffer, xc_stat_file, (void *) pbuf TSRMLS_CC)
+static int xc_resolve_path_stat(const char *filepath, char *path_buffer, struct stat *pbuf TSRMLS_DC) /* {{{ */
+{
+    return xc_resolve_path(filepath, path_buffer, xc_stat_file, (void *) pbuf TSRMLS_CC)
         ? SUCCESS
         : FAILURE;
@@ -985 +1004 @@
 /* }}} */
 #endif
-typedef struct xc_entry_find_include_path_data_t { /* {{{ */
+typedef struct xc_entry_resolve_path_data_t { /* {{{ */
     xc_compiler_t *compiler;
     xc_entry_php_t **stored_entry;
-} xc_entry_find_include_path_data_t;
-/* }}} */
-static XC_INCLUDE_PATH_XSTAT_FUNC(xc_entry_find_include_path_func_unlocked) /* {{{ */
-{
-    xc_entry_find_include_path_data_t *entry_find_include_path_data = (xc_entry_find_include_path_data_t *) data;
-    xc_compiler_t *compiler = entry_find_include_path_data->compiler;
+} xc_entry_resolve_path_data_t;
+/* }}} */
+static XC_RESOLVE_PATH_CHECKER(xc_entry_resolve_path_func_unlocked) /* {{{ */
+{
+    xc_entry_resolve_path_data_t *entry_resolve_path_data = (xc_entry_resolve_path_data_t *) data;
+    xc_compiler_t *compiler = entry_resolve_path_data->compiler;
 
     compiler->new_entry.entry.name.str.val = xc_expand_url(filepath, compiler->opened_path_buffer TSRMLS_CC);
     compiler->new_entry.entry.name.str.len = strlen(compiler->new_entry.entry.name.str.val);
 
-    *entry_find_include_path_data->stored_entry = (xc_entry_php_t *) xc_entry_find_unlocked(
+    *entry_resolve_path_data->stored_entry = (xc_entry_php_t *) xc_entry_find_unlocked(
             XC_TYPE_PHP
             , xc_php_caches[compiler->entry_hash.cacheid]
@@ -1005 +1024 @@
             TSRMLS_CC);
 
-    return *entry_find_include_path_data->stored_entry ? 1 : 0;
-}
-/* }}} */
-static int xc_entry_find_include_path_unlocked(xc_compiler_t *compiler, const char *filepath, xc_entry_php_t **stored_entry TSRMLS_DC) /* {{{ */
+    return *entry_resolve_path_data->stored_entry ? 1 : 0;
+}
+/* }}} */
+static int xc_entry_resolve_path_unlocked(xc_compiler_t *compiler, const char *filepath, xc_entry_php_t **stored_entry TSRMLS_DC) /* {{{ */
 {
     char path_buffer[MAXPATHLEN];
-    xc_entry_find_include_path_data_t entry_find_include_path_data;
-    entry_find_include_path_data.compiler = compiler;
-    entry_find_include_path_data.stored_entry = stored_entry;
-
-    return xc_include_path_apply(filepath, path_buffer, xc_entry_find_include_path_func_unlocked, (void *) &entry_find_include_path_data TSRMLS_CC)
+    xc_entry_resolve_path_data_t entry_resolve_path_data;
+    entry_resolve_path_data.compiler = compiler;
+    entry_resolve_path_data.stored_entry = stored_entry;
+
+    return xc_resolve_path(filepath, path_buffer, xc_entry_resolve_path_func_unlocked, (void *) &entry_resolve_path_data TSRMLS_CC)
         ? SUCCESS
         : FAILURE;
@@ -1027 +1046 @@
             struct stat *sapi_stat = sapi_get_stat(TSRMLS_C);
             if (!sapi_stat) {
-                return FAILURE;
-            }
-
+                goto giveupsapistat;
+            }
             *statbuf = *sapi_stat;
         }
 
-        compiler->opened_path = xc_expand_url(SG(request_info).path_translated, compiler->opened_path_buffer TSRMLS_CC);
+        compiler->opened_path = xc_expand_url(compiler->filename, compiler->opened_path_buffer TSRMLS_CC);
         return SUCCESS;
     }
+giveupsapistat:
 
     /* absolute path */
@@ -1087 +1106 @@
 #else
         char path_buffer[MAXPATHLEN];
-        if (xc_include_path_stat(compiler->filename, path_buffer, statbuf TSRMLS_CC) == SUCCESS) {
+        if (xc_resolve_path_stat(compiler->filename, path_buffer, statbuf TSRMLS_CC) == SUCCESS) {
             compiler->opened_path = xc_expand_url(path_buffer, compiler->opened_path_buffer TSRMLS_CC);
             return SUCCESS;
@@ -1911 +1930 @@
 
     ENTER_LOCK_EX(cache) {
-        if (!compiler->opened_path && xc_entry_find_include_path_unlocked(compiler, compiler->filename, &stored_entry TSRMLS_CC) == SUCCESS) {
+        if (!compiler->opened_path && xc_entry_resolve_path_unlocked(compiler, compiler->filename, &stored_entry TSRMLS_CC) == SUCCESS) {
             compiler->opened_path = compiler->new_entry.entry.name.str.val;
         }
@@ -3860 +3879 @@
 static PHP_MSHUTDOWN_FUNCTION(xcache)
 {
+#ifdef HAVE_XCACHE_COVERAGER
+    xc_coverager_destroy();
+#endif
+    xc_util_destroy();
+
     if (xc_initized) {
         xc_destroy();
@@ -3871 +3895 @@
         xc_shm_scheme = NULL;
     }
-
-#ifdef HAVE_XCACHE_COVERAGER
-    xc_coverager_destroy();
-#endif
-    xc_util_destroy();
 
     if (xc_coredump_dir && xc_coredump_dir[0]) {