Changeset 405

Timestamp:

05/31/2007 03:48:08 AM (17 months ago)

Author:

moo

Message:

full ZendOptimizer? compatibility

Location:

trunk

Files:

• utils.c (modified) (4 diffs)
• utils.h (modified) (1 diff)
• xcache.c (modified) (11 diffs)
• xcache_globals.h (modified) (1 diff)

trunk/utils.c

@@ -624 +624 @@
 }
 /* }}} */
-static void xc_sandbox_install(xc_sandbox_t *sandbox TSRMLS_DC) /* {{{ */
+static void xc_sandbox_install(xc_sandbox_t *sandbox, xc_install_action_t install TSRMLS_DC) /* {{{ */
 {
     int i;
@@ -668 +668 @@
 #endif
 
-    xc_undo_pass_two(CG(active_op_array) TSRMLS_CC);
-    xc_foreach_early_binding_class(CG(active_op_array), xc_early_binding_cb, (void *) sandbox TSRMLS_CC);
-    xc_redo_pass_two(CG(active_op_array) TSRMLS_CC);
+    if (install != XC_InstallNoBinding) {
+        xc_undo_pass_two(CG(active_op_array) TSRMLS_CC);
+        xc_foreach_early_binding_class(CG(active_op_array), xc_early_binding_cb, (void *) sandbox TSRMLS_CC);
+        xc_redo_pass_two(CG(active_op_array) TSRMLS_CC);
+    }
 
     i = 1;
@@ -676 +678 @@
 }
 /* }}} */
-void xc_sandbox_free(xc_sandbox_t *sandbox, int install TSRMLS_DC) /* {{{ */
+void xc_sandbox_free(xc_sandbox_t *sandbox, xc_install_action_t install TSRMLS_DC) /* {{{ */
 {
     /* restore first first install function/class */
@@ -689 +691 @@
 #endif
 
-    if (install) {
+    if (install != XC_NoInstall) {
         CG(in_compilation)    = 1;
         CG(compiled_filename) = sandbox->filename;
         CG(zend_lineno)       = 0;
-        xc_sandbox_install(sandbox TSRMLS_CC);
+        xc_sandbox_install(sandbox, install TSRMLS_CC);
         CG(in_compilation)    = 0;
         CG(compiled_filename) = NULL;

trunk/utils.h

@@ -100 +100 @@
 } xc_sandbox_t;
 
+typedef enum _xc_install_action_t {
+    XC_NoInstall,
+    XC_Install,
+    XC_InstallNoBinding
+} xc_install_action_t;
+
 void xc_zend_class_add_ref(zend_class_entry ZESW(*ce, **ce));
 xc_sandbox_t *xc_sandbox_init(xc_sandbox_t *sandbox, char *filename TSRMLS_DC);
-void xc_sandbox_free(xc_sandbox_t *sandbox, int install TSRMLS_DC);
+void xc_sandbox_free(xc_sandbox_t *sandbox, xc_install_action_t install TSRMLS_DC);

trunk/xcache.c

@@ -87 +87 @@
 
 static zend_bool xc_initized = 0;
+static zend_compile_file_t *origin_compile_file = NULL;
 static zend_compile_file_t *old_compile_file = NULL;
 static zend_llist_element  *xc_llist_zend_extension = NULL;
@@ -974 +975 @@
     old_constinfo_cnt = zend_hash_num_elements(EG(zend_constants));
 
+    php->op_array = NULL;
+    XG(initial_compile_file_called) = 0;
     zend_try {
         op_array = old_compile_file(h, type TSRMLS_CC);
@@ -986 +989 @@
     if (op_array == NULL) {
         goto err_op_array;
+    }
+
+    if (!XG(initial_compile_file_called)) {
+        return op_array;
     }
 
@@ -1164 +1171 @@
 }
 /* }}} */
+static zend_op_array *xc_check_initial_compile_file(zend_file_handle *h, int type TSRMLS_DC) /* {{{ */
+{
+    XG(initial_compile_file_called) = 1;
+    return origin_compile_file(h, type TSRMLS_CC);
+}
+/* }}} */
 static zend_op_array *xc_compile_file(zend_file_handle *h, int type TSRMLS_DC) /* {{{ */
 {
@@ -1290 +1303 @@
         }
 
+        /* not cachable */
+        if (!php.op_array) {
+            cache->compiling = 0;
+            xc_sandbox_free(&sandbox, XC_InstallNoBinding TSRMLS_CC);
+            return op_array;
+        }
+
         xce.data.php = &php;
     }
@@ -1355 +1375 @@
         }
         if (newlycompiled) {
-            xc_sandbox_free(&sandbox, 0 TSRMLS_CC);
+            xc_sandbox_free(&sandbox, XC_NoInstall TSRMLS_CC);
         }
         return xc_compile_restore(stored_xce, h TSRMLS_CC);
@@ -1363 +1383 @@
             /* install it */
             CG(active_op_array) = op_array;
-            xc_sandbox_free(&sandbox, 1 TSRMLS_CC);
+            xc_sandbox_free(&sandbox, XC_Install TSRMLS_CC);
         }
     }
@@ -1371 +1391 @@
     if (newlycompiled) {
         xc_free_php(&php TSRMLS_CC);
-        xc_sandbox_free(&sandbox, 0 TSRMLS_CC);
+        xc_sandbox_free(&sandbox, XC_NoInstall TSRMLS_CC);
     }
 
@@ -1564 +1584 @@
         zend_compile_file = old_compile_file;
         old_compile_file = NULL;
+    }
+
+    if (origin_compile_file) {
+        zend_compile_file = origin_compile_file;
+        origin_compile_file = NULL;
     }
 
@@ -2915 +2940 @@
 #endif
 /* }}} */
-static startup_func_t xc_last_ext_startup = NULL;
+static startup_func_t xc_last_ext_startup;
 static int xc_zend_startup_last(zend_extension *extension) /* {{{ */
 {
@@ -2936 +2961 @@
 {
     xc_zend_extension_gotup = 1;
+
+    if (!origin_compile_file) {
+        origin_compile_file = zend_compile_file;
+        zend_compile_file = xc_check_initial_compile_file;
+    }
+
     if (zend_llist_count(&zend_extensions) > 1) {
         zend_llist_position lpos;

trunk/xcache_globals.h

@@ -1 +1 @@
 
 ZEND_BEGIN_MODULE_GLOBALS(xcache)
+    zend_bool initial_compile_file_called; /* true is origin_compile_file is called */
     zend_bool cacher;      /* true if enabled */
     zend_bool stat;