Changeset 684

Timestamp:

09/29/2009 01:25:01 PM (4 years ago)

Author:

moo

Message:

the logic of implemenation of dir/file path fixing was wrong. file/dir path should be cached before hardlink

Location:

trunk

Files:

• processor/head.m4 (modified) (3 diffs)
• processor/processor.m4 (modified) (3 diffs)
• xcache.c (modified) (31 diffs)
• xcache.h (modified) (3 diffs)

trunk/processor/head.m4

@@ -65 +65 @@
     zend_bool reference; /* enable if to deal with reference */
     zend_bool have_references;
+    const xc_entry_t *entry_src;
+    const xc_entry_t *entry_dst;
     const xc_entry_data_php_t *php_src;
     const xc_entry_data_php_t *php_dst;
@@ -391 +393 @@
 }
 /* }}} */
-/* export: xc_entry_data_php_t *xc_processor_restore_xc_entry_data_php_t(xc_entry_data_php_t *dst, const xc_entry_data_php_t *src, zend_bool readonly_protection TSRMLS_DC); :export {{{ */
-xc_entry_data_php_t *xc_processor_restore_xc_entry_data_php_t(xc_entry_data_php_t *dst, const xc_entry_data_php_t *src, zend_bool readonly_protection TSRMLS_DC) {
+/* export: xc_entry_data_php_t *xc_processor_restore_xc_entry_data_php_t(const xc_entry_t *xce, xc_entry_data_php_t *dst, const xc_entry_data_php_t *src, zend_bool readonly_protection TSRMLS_DC); :export {{{ */
+xc_entry_data_php_t *xc_processor_restore_xc_entry_data_php_t(const xc_entry_t *xce, xc_entry_data_php_t *dst, const xc_entry_data_php_t *src, zend_bool readonly_protection TSRMLS_DC) {
     xc_processor_t processor;
 
@@ -401 +403 @@
         processor.reference = 1;
     }
+    processor.entry_src = xce;
 
     if (processor.reference) {

trunk/processor/processor.m4

@@ -664 +664 @@
 #endif
     } while (0);
-    IFRESTORE(`xc_fix_op_array_info(processor->php_src, dst, !shallow_copy, op_array_info TSRMLS_CC);')
+    IFRESTORE(`xc_fix_op_array_info(processor->entry_src, processor->php_src, dst, !shallow_copy, op_array_info TSRMLS_CC);')
 
 #ifdef ZEND_ENGINE_2
@@ -819 +819 @@
     DISPATCH(size_t, size)
 
-    DISPATCH(int, filepath_len)
-    IFRESTORE(`COPY(filepath)', `PROC_STRING_L(filepath, filepath_len)')
-    DISPATCH(int, dirpath_len)
-    IFRESTORE(`COPY(dirpath)', `PROC_STRING_L(dirpath, dirpath_len)')
-#ifdef IS_UNICODE
-    DISPATCH(int, ufilepath_len)
-    IFRESTORE(`COPY(ufilepath)', `PROC_USTRING_L(ufilepath, ufilepath_len)')
-    DISPATCH(int, udirpath_len)
-    IFRESTORE(`COPY(udirpath)', `PROC_USTRING_L(udirpath, udirpath_len)')
-#endif
-
     IFRESTORE(`COPY(op_array_info)', `
         STRUCT(xc_op_array_info_t, op_array_info)
@@ -943 +932 @@
     DISPATCH(int, inode)
 #endif
+
+    DISPATCH(int, filepath_len)
+    IFRESTORE(`COPY(filepath)', `PROC_STRING_L(filepath, filepath_len)')
+    DISPATCH(int, dirpath_len)
+    IFRESTORE(`COPY(dirpath)', `PROC_STRING_L(dirpath, dirpath_len)')
+#ifdef IS_UNICODE
+    DISPATCH(int, ufilepath_len)
+    IFRESTORE(`COPY(ufilepath)', `PROC_USTRING_L(ufilepath, ufilepath_len)')
+    DISPATCH(int, udirpath_len)
+    IFRESTORE(`COPY(udirpath)', `PROC_USTRING_L(udirpath, udirpath_len)')
+#endif
+
 ')
 dnl }}}

trunk/xcache.c

@@ -1 +1 @@
 
-#if 0
+#if 1
 #define XCACHE_DEBUG
 #endif
@@ -945 +945 @@
 }
 /* }}} */
-static int xc_entry_init_key_php(xc_entry_t *xce, char *filename, char *opened_path_buffer TSRMLS_DC) /* {{{ */
-{
+static void xc_entry_free_key_php(xc_entry_t *xce TSRMLS_DC) /* {{{ */
+{
+#define X_FREE(var) do {\
+    if (xce->var) { \
+        efree(xce->var); \
+    } \
+} while (0)
+    X_FREE(dirpath);
+#ifdef IS_UNICODE
+    X_FREE(ufilepath);
+    X_FREE(udirpath);
+#endif
+
+#undef X_FREE
+}
+/* }}} */
+
+static int xc_entry_init_key_php(xc_entry_t *xce, char *filename TSRMLS_DC) /* {{{ */
+{
+    char opened_path_buffer[MAXPATHLEN];
     struct stat buf, *pbuf;
     xc_hash_value_t hv;
@@ -1106 +1124 @@
 
     return SUCCESS;
+}
+/* }}} */
+static void xc_entry_init_key_php_entry(xc_entry_t *xce, char *filepath TSRMLS_DC) /* {{{*/
+{
+    xce->filepath     = filepath;
+    xce->filepath_len = strlen(xce->filepath);
+    xce->dirpath      = estrndup(xce->filepath, xce->filepath_len);
+    xce->dirpath_len  = zend_dirname(xce->dirpath, xce->filepath_len);
+#ifdef IS_UNICODE
+    zend_string_to_unicode(ZEND_U_CONVERTER(UG(runtime_encoding_conv)), &xce->ufilepath, &xce->ufilepath_len, xce->filepath, xce->filepath_len TSRMLS_CC);
+    zend_string_to_unicode(ZEND_U_CONVERTER(UG(runtime_encoding_conv)), &xce->udirpath,  &xce->udirpath_len,  xce->dirpath,  xce->dirpath_len TSRMLS_CC);
+#endif
 }
 /* }}} */
@@ -1150 +1180 @@
 } xc_const_usage_t;
 /* }}} */
-static void xc_collect_op_array_info(xc_entry_data_php_t *php, xc_const_usage_t *usage, xc_op_array_info_t *op_array_info, zend_op_array *op_array TSRMLS_DC) /* {{{ */
+static void xc_collect_op_array_info(xc_entry_t *xce, xc_entry_data_php_t *php, xc_const_usage_t *usage, xc_op_array_info_t *op_array_info, zend_op_array *op_array TSRMLS_DC) /* {{{ */
 {
     int oplineno;
@@ -1158 +1188 @@
 
 #define XCACHE_CHECK_OP(type, op) \
-    if (zend_binary_strcmp(Z_STRVAL(opline->op.u.constant), Z_STRLEN(opline->op.u.constant), php->type##path, php->type##path_len) == 0) { \
+    if (zend_binary_strcmp(Z_STRVAL(opline->op.u.constant), Z_STRLEN(opline->op.u.constant), xce->type##path, xce->type##path_len) == 0) { \
         usage->type##path_used = 1; \
         oplineinfo |= xcache_##op##_is_##type; \
@@ -1164 +1194 @@
 
 #define XCACHE_U_CHECK_OP(type, op) \
-    if (zend_u_##binary_strcmp(Z_USTRVAL(opline->op.u.constant), Z_USTRLEN(opline->op.u.constant), php->u##type##path, php->u##type##path_len) == 0) { \
+    if (zend_u_##binary_strcmp(Z_USTRVAL(opline->op.u.constant), Z_USTRLEN(opline->op.u.constant), xce->u##type##path, xce->u##type##path_len) == 0) { \
         usage->u##type##path_used = 1; \
         oplineinfo |= xcache_##op##_is_##type; \
@@ -1209 +1239 @@
 }
 /* }}} */
-void xc_fix_op_array_info(const xc_entry_data_php_t *php, zend_op_array *op_array, int copy, const xc_op_array_info_t *op_array_info TSRMLS_DC) /* {{{ */
+void xc_fix_op_array_info(const xc_entry_t *xce, const xc_entry_data_php_t *php, zend_op_array *op_array, int copy, const xc_op_array_info_t *op_array_info TSRMLS_DC) /* {{{ */
 {
     int i;
@@ -1226 +1256 @@
             }
             if (Z_TYPE(opline->op1.u.constant) == IS_STRING) {
-                assert(php->filepath);
-                ZVAL_STRINGL(&opline->op1.u.constant, php->filepath, php->filepath_len, copy);
+                assert(xce->filepath);
+                ZVAL_STRINGL(&opline->op1.u.constant, xce->filepath, xce->filepath_len, copy);
+                TRACE("fixing op1 to %s", xce->filepath);
             }
 #ifdef IS_UNICODE
             else if (Z_TYPE(opline->op1.u.constant) == IS_UNICODE) {
-                assert(php->ufilepath);
-                ZVAL_UNICODEL(&opline->op1.u.constant, php->ufilepath, php->ufilepath_len, copy);
+                assert(xce->ufilepath);
+                ZVAL_UNICODEL(&opline->op1.u.constant, xce->ufilepath, xce->ufilepath_len, copy);
             }
 #endif
@@ -1245 +1276 @@
             }
             if (Z_TYPE(opline->op1.u.constant) == IS_STRING) {
-                assert(php->dirpath);
-                ZVAL_STRINGL(&opline->op1.u.constant, php->dirpath, php->dirpath_len, copy);
+                assert(xce->dirpath);
+                TRACE("fixing op1 to %s", xce->dirpath);
+                ZVAL_STRINGL(&opline->op1.u.constant, xce->dirpath, xce->dirpath_len, copy);
             }
 #ifdef IS_UNICODE
             else if (Z_TYPE(opline->op1.u.constant) == IS_UNICODE) {
-                assert(!php->udirpath);
-                ZVAL_UNICODEL(&opline->op1.u.constant, php->udirpath, php->udirpath_len, copy);
+                assert(!xce->udirpath);
+                ZVAL_UNICODEL(&opline->op1.u.constant, xce->udirpath, xce->udirpath_len, copy);
             }
 #endif
@@ -1265 +1297 @@
             }
             if (Z_TYPE(opline->op2.u.constant) == IS_STRING) {
-                assert(php->filepath);
-                ZVAL_STRINGL(&opline->op2.u.constant, php->filepath, php->filepath_len, copy);
+                assert(xce->filepath);
+                TRACE("fixing op2 to %s", xce->filepath);
+                ZVAL_STRINGL(&opline->op2.u.constant, xce->filepath, xce->filepath_len, copy);
             }
 #ifdef IS_UNICODE
             else if (Z_TYPE(opline->op2.u.constant) == IS_UNICODE) {
-                assert(php->ufilepath);
-                ZVAL_UNICODEL(&opline->op2.u.constant, php->ufilepath, php->ufilepath_len, copy);
+                assert(xce->ufilepath);
+                ZVAL_UNICODEL(&opline->op2.u.constant, xce->ufilepath, xce->ufilepath_len, copy);
             }
 #endif
@@ -1284 +1317 @@
             }
             if (Z_TYPE(opline->op2.u.constant) == IS_STRING) {
-                assert(!php->dirpath);
-                ZVAL_STRINGL(&opline->op2.u.constant, php->dirpath, php->dirpath_len, copy);
+                assert(!xce->dirpath);
+                TRACE("fixing op2 to %s", xce->dirpath);
+                ZVAL_STRINGL(&opline->op2.u.constant, xce->dirpath, xce->dirpath_len, copy);
             }
 #ifdef IS_UNICODE
             else if (Z_TYPE(opline->op2.u.constant) == IS_UNICODE) {
-                assert(!php->udirpath);
-                ZVAL_UNICODEL(&opline->op2.u.constant, php->udirpath, php->udirpath_len, copy);
+                assert(!xce->udirpath);
+                ZVAL_UNICODEL(&opline->op2.u.constant, xce->udirpath, xce->udirpath_len, copy);
             }
 #endif
@@ -1336 +1370 @@
 } while (0)
 
-    X_FREE(dirpath);
-#ifdef IS_UNICODE
-    X_FREE(ufilepath);
-    X_FREE(udirpath);
-#endif
-
 #ifdef ZEND_ENGINE_2_1
     X_FREE(autoglobals);
@@ -1353 +1381 @@
 }
 /* }}} */
-static zend_op_array *xc_compile_php(xc_entry_data_php_t *php, zend_file_handle *h, int type TSRMLS_DC) /* {{{ */
+static zend_op_array *xc_compile_php(xc_entry_t *xce, xc_entry_data_php_t *php, zend_file_handle *h, int type TSRMLS_DC) /* {{{ */
 {
     zend_op_array *op_array;
     int old_constinfo_cnt, old_funcinfo_cnt, old_classinfo_cnt;
     zend_bool catched = 0;
-    xc_const_usage_t const_usage;
 
     /* {{{ compile */
@@ -1436 +1463 @@
     /* }}} */
 
-    /* {{{ file/dir path init */
-    memset(&const_usage, 0, sizeof(const_usage));
-    php->filepath     = zend_get_compiled_filename(TSRMLS_C);
-    php->filepath_len = strlen(php->filepath);
-    php->dirpath      = estrndup(php->filepath, php->filepath_len);
-    php->dirpath_len  = zend_dirname(php->dirpath, php->filepath_len);
-#ifdef IS_UNICODE
-    zend_string_to_unicode(ZEND_U_CONVERTER(UG(runtime_encoding_conv)), &php->ufilepath, &php->ufilepath_len, php->filepath, php->filepath_len TSRMLS_CC);
-    zend_string_to_unicode(ZEND_U_CONVERTER(UG(runtime_encoding_conv)), &php->udirpath,  &php->udirpath_len,  php->dirpath,  php->dirpath_len TSRMLS_CC);
-#endif
-    /* }}} */
     /* {{{ shallow copy, pointers only */ {
         Bucket *b;
@@ -1482 +1498 @@
         b = CG(class_table)->pListHead;    COPY_H(xc_classinfo_t, classinfos, classinfo_cnt, cest,     xc_cest_t);
 
-        for (i = 0; i < php->classinfo_cnt; i ++) {
-            xc_classinfo_t *classinfo = &php->classinfos[i];
-            zend_class_entry *ce = CestToCePtr(classinfo->cest);
-            classinfo->methodinfo_cnt = ce->function_table.nTableSize;
-            if (classinfo->methodinfo_cnt) {
-                int j;
-
-                ECALLOC_N(classinfo->methodinfos, classinfo->methodinfo_cnt);
-                if (!classinfo->methodinfos) {
-                    goto err_alloc;
-                }
-
-                for (j = 0, b = ce->function_table.pListHead; b; j ++, b = b->pListNext) {
-                    xc_collect_op_array_info(php, &const_usage, &classinfo->methodinfos[j], (zend_op_array *) b->pData TSRMLS_CC);
-                }
-            }
-            else {
-                classinfo->methodinfos = NULL;
-            }
-        }
-
-        for (i = 0; i < php->funcinfo_cnt; i ++) {
-            xc_collect_op_array_info(php, &const_usage, &php->funcinfos[i].op_array_info, (zend_op_array *) &php->funcinfos[i].func TSRMLS_CC);
-        }
-
-        xc_collect_op_array_info(php, &const_usage, &php->op_array_info, php->op_array TSRMLS_CC);
-
 #undef COPY_H
 
@@ -1538 +1527 @@
     }
     /* }}} */
-    /* {{{ file/dir path free unused */
+
+    /* {{{ collect info for file/dir path */ {
+        Bucket *b;
+        xc_const_usage_t const_usage;
+        unsigned int i;
+
+        xc_entry_init_key_php_entry(xce, zend_get_compiled_filename(TSRMLS_C) TSRMLS_CC);
+        memset(&const_usage, 0, sizeof(const_usage));
+
+        for (i = 0; i < php->classinfo_cnt; i ++) {
+            xc_classinfo_t *classinfo = &php->classinfos[i];
+            zend_class_entry *ce = CestToCePtr(classinfo->cest);
+            classinfo->methodinfo_cnt = ce->function_table.nTableSize;
+            if (classinfo->methodinfo_cnt) {
+                int j;
+
+                ECALLOC_N(classinfo->methodinfos, classinfo->methodinfo_cnt);
+                if (!classinfo->methodinfos) {
+                    goto err_alloc;
+                }
+
+                for (j = 0, b = ce->function_table.pListHead; b; j ++, b = b->pListNext) {
+                    xc_collect_op_array_info(xce, php, &const_usage, &classinfo->methodinfos[j], (zend_op_array *) b->pData TSRMLS_CC);
+                }
+            }
+            else {
+                classinfo->methodinfos = NULL;
+            }
+        }
+
+        for (i = 0; i < php->funcinfo_cnt; i ++) {
+            xc_collect_op_array_info(xce, php, &const_usage, &php->funcinfos[i].op_array_info, (zend_op_array *) &php->funcinfos[i].func TSRMLS_CC);
+        }
+
+        xc_collect_op_array_info(xce, php, &const_usage, &php->op_array_info, php->op_array TSRMLS_CC);
+
+        /* file/dir path free unused */
 #define X_FREE_UNUSED(var) \
-    if (!const_usage.var##path_used) { \
-        efree(php->var##path); \
-        php->var##path = NULL; \
-        php->var##path_len = 0; \
-    }
-    if (!const_usage.filepath_used) {
-        php->filepath = NULL;
-        php->filepath_len = 0;
-    }
-    X_FREE_UNUSED(dir)
+        if (!const_usage.var##path_used) { \
+            efree(xce->var##path); \
+            xce->var##path = NULL; \
+            xce->var##path_len = 0; \
+        }
+        if (!const_usage.filepath_used) {
+            xce->filepath = NULL;
+            xce->filepath_len = 0;
+        }
+        X_FREE_UNUSED(dir)
 #ifdef IS_UNICODE
-    X_FREE_UNUSED(ufile)
-    X_FREE_UNUSED(udir)
+        X_FREE_UNUSED(ufile)
+        X_FREE_UNUSED(udir)
 #endif
 #undef X_FREE_UNUSED
+    }
     /* }}} */
 #ifdef XCACHE_ERROR_CACHING
@@ -1603 +1629 @@
     TRACE("restoring %s", stored_xce->name.str.val);
     xc_processor_restore_xc_entry_t(&xce, stored_xce TSRMLS_CC);
-    xc_processor_restore_xc_entry_data_php_t(&php, xce.data.php, xc_readonly_protection TSRMLS_CC);
+    xc_processor_restore_xc_entry_data_php_t(stored_xce, &php, xce.data.php, xc_readonly_protection TSRMLS_CC);
     xce.data.php = &php;
 #ifdef SHOW_DPRINT
@@ -1641 +1667 @@
 }
 /* }}} */
-static zend_op_array *xc_compile_file(zend_file_handle *h, int type TSRMLS_DC) /* {{{ */
+static zend_op_array *xc_compile_file_ex(xc_entry_t *xce, zend_file_handle *h, int type TSRMLS_DC) /* {{{ */
 {
     zend_op_array *op_array;
-    xc_entry_t xce, *stored_xce;
-    xc_entry_data_php_t php, *stored_php;
-    xc_cache_t *cache;
+    xc_entry_t *stored_xce;
+    xc_entry_data_php_t *stored_php;
+    xc_cache_t *cache = xce->cache;
     zend_bool gaveup = 0;
     zend_bool catched = 0;
     zend_bool newlycompiled;
-    char *filename;
-    char opened_path_buffer[MAXPATHLEN];
     xc_sandbox_t sandbox;
-
-    assert(xc_initized);
-
-    TRACE("type = %d\n", h->type);
-    if (!XG(cacher)) {
-        op_array = old_compile_file(h, type TSRMLS_CC);
-        return op_array;
-    }
-
-    /* {{{ entry_init_key */
-    filename = h->opened_path ? h->opened_path : h->filename;
-    xce.data.php = &php;
-    if (xc_entry_init_key_php(&xce, filename, opened_path_buffer TSRMLS_CC) != SUCCESS) {
-        TRACE("failed to init key for %s", filename);
-        return old_compile_file(h, type TSRMLS_CC);
-    }
-    cache = xce.cache;
-    /* }}} */
 
     /* stale clogs precheck */
@@ -1681 +1687 @@
     stored_php = NULL;
     ENTER_LOCK_EX(cache) {
-        stored_xce = xc_entry_find_dmz(&xce TSRMLS_CC);
+        stored_xce = xc_entry_find_dmz(xce TSRMLS_CC);
         if (stored_xce) {
             xc_cache_hit_dmz(cache TSRMLS_CC);
@@ -1690 +1696 @@
         else {
             cache->misses ++;
-            TRACE("miss %s", xce.name.str.val);
-
-            if (xc_entry_init_key_php_md5(&php, &xce TSRMLS_CC) != SUCCESS) {
+            TRACE("miss %s", xce->name.str.val);
+
+            if (xc_entry_init_key_php_md5(xce->data.php, xce TSRMLS_CC) != SUCCESS) {
                 gaveup = 1;
                 break;
             }
 
-            stored_php = xc_php_find_dmz(&php TSRMLS_CC);
+            stored_php = xc_php_find_dmz(xce->data.php TSRMLS_CC);
 
             /* miss but compiling */
@@ -1736 +1742 @@
     if (stored_php) {
         newlycompiled = 0;
-        xce.data.php = stored_php;
+        xc_entry_init_key_php_entry(xce, h->opened_path ? h->opened_path : h->filename TSRMLS_CC);
+        xce->data.php = stored_php;
     }
     else {
@@ -1742 +1749 @@
 
         /* make compile inside sandbox */
-        xc_sandbox_init(&sandbox, filename TSRMLS_CC);
+        xc_sandbox_init(&sandbox, h->opened_path ? h->opened_path : h->filename TSRMLS_CC);
 
 #ifdef HAVE_XCACHE_CONSTANT
-        php.constinfos  = NULL;
-#endif
-        php.funcinfos   = NULL;
-        php.classinfos  = NULL;
+        xce->data.php->constinfos  = NULL;
+#endif
+        xce->data.php->funcinfos   = NULL;
+        xce->data.php->classinfos  = NULL;
 #ifdef ZEND_ENGINE_2_1
-        php.autoglobals = NULL;
-#endif
-
-#ifdef IS_UNICODE
-        php.udirpath = NULL;
-        php.ufilepath = NULL;
-#endif
-        php.dirpath = NULL;
-
-        memset(&php.op_array_info, 0, sizeof(php.op_array_info));
+        xce->data.php->autoglobals = NULL;
+#endif
+
+        memset(&xce->data.php->op_array_info, 0, sizeof(xce->data.php->op_array_info));
 
         zend_try {
-            op_array = xc_compile_php(&php, h, type TSRMLS_CC);
+            op_array = xc_compile_php(xce, xce->data.php, h, type TSRMLS_CC);
         } zend_catch {
             catched = 1;
@@ -1772 +1773 @@
 
         /* not cachable */
-        if (!php.op_array) {
+        if (!xce->data.php->op_array) {
             cache->compiling = 0;
             /* it's not cachable, but don't scare the users with high misses */
@@ -1779 +1780 @@
             return op_array;
         }
-
-        xce.data.php = &php;
     }
     /* }}} */
@@ -1789 +1788 @@
      * WARNING: this code is required to be after compile
      */
-    if (xce.inode) {
-        filename = h->opened_path ? h->opened_path : h->filename;
-        if (xce.name.str.val != filename) {
-            xce.name.str.val = filename;
-            xce.name.str.len = strlen(filename);
+    if (xce->inode) {
+        char *filename = h->opened_path ? h->opened_path : h->filename;
+        if (xce->name.str.val != filename) {
+            xce->name.str.val = filename;
+            xce->name.str.len = strlen(filename);
         }
     }
@@ -1799 +1798 @@
 #endif
 #ifdef SHOW_DPRINT
-    xc_dprint(&xce, 0 TSRMLS_CC);
+    xc_dprint(xce, 0 TSRMLS_CC);
 #endif
     stored_xce = NULL;
@@ -1805 +1804 @@
         /* php_store */
         if (newlycompiled) {
-            stored_php = xc_php_store_dmz(&php TSRMLS_CC);
+            stored_php = xc_php_store_dmz(xce->data.php TSRMLS_CC);
             if (!stored_php) {
                 /* error */
@@ -1813 +1812 @@
         /* entry_store */
         xc_php_addref_dmz(stored_php);
-        stored_xce = xc_entry_store_dmz(&xce TSRMLS_CC);
+        stored_xce = xc_entry_store_dmz(xce TSRMLS_CC);
         if (stored_xce) {
             stored_xce->data.php = stored_php;
@@ -1831 +1830 @@
 
     if (newlycompiled) {
-        xc_free_php(&php TSRMLS_CC);
+        xc_free_php(xce->data.php TSRMLS_CC);
     }
 
@@ -1862 +1861 @@
 err_aftersandbox:
     if (newlycompiled) {
-        xc_free_php(&php TSRMLS_CC);
+        xc_free_php(xce->data.php TSRMLS_CC);
         xc_sandbox_free(&sandbox, XC_NoInstall TSRMLS_CC);
     }
@@ -1871 +1870 @@
         zend_bailout();
     }
+    return op_array;
+}
+/* }}} */
+static zend_op_array *xc_compile_file(zend_file_handle *h, int type TSRMLS_DC) /* {{{ */
+{
+    zend_op_array *op_array;
+    xc_entry_t xce;
+    xc_entry_data_php_t php;
+    char *filename;
+
+    assert(xc_initized);
+
+    TRACE("type = %d\n", h->type);
+    if (!XG(cacher)) {
+        op_array = old_compile_file(h, type TSRMLS_CC);
+        return op_array;
+    }
+
+    /* {{{ entry_init_key */
+    filename = h->opened_path ? h->opened_path : h->filename;
+    xce.data.php = &php;
+    if (xc_entry_init_key_php(&xce, filename TSRMLS_CC) != SUCCESS) {
+        TRACE("failed to init key for %s", filename);
+        return old_compile_file(h, type TSRMLS_CC);
+    }
+    /* }}} */
+
+    op_array = xc_compile_file_ex(&xce, h, type TSRMLS_CC);
+
+    xc_entry_free_key_php(&xce TSRMLS_CC);
+
     return op_array;
 }

trunk/xcache.h

@@ -320 +320 @@
     size_t     size;
 
-    int    filepath_len;
-    char  *filepath;
-    int    dirpath_len;
-    char  *dirpath;
-#ifdef IS_UNICODE
-    UChar *ufilepath;
-    int    ufilepath_len;
-    UChar *udirpath;
-    int    udirpath_len;
-#endif
-
     xc_op_array_info_t op_array_info;
     zend_op_array *op_array;
@@ -399 +388 @@
     int inode;              /* the filesystem inode */
 #endif
+
+    /* php only */
+    int    filepath_len;
+    char  *filepath;
+    int    dirpath_len;
+    char  *dirpath;
+#ifdef IS_UNICODE
+    UChar *ufilepath;
+    int    ufilepath_len;
+    UChar *udirpath;
+    int    udirpath_len;
+#endif
+
 };
 /* }}} */
@@ -419 +421 @@
 /* }}} */
 void xc_gc_add_op_array(xc_gc_op_array_t *gc_op_array TSRMLS_DC);
-void xc_fix_op_array_info(const xc_entry_data_php_t *php, zend_op_array *op_array, int shallow_copied, const xc_op_array_info_t *op_array_info TSRMLS_DC);
+void xc_fix_op_array_info(const xc_entry_t *xce, const xc_entry_data_php_t *php, zend_op_array *op_array, int shallow_copied, const xc_op_array_info_t *op_array_info TSRMLS_DC);
 
 #endif /* __XCACHE_H */