Changeset 189

Timestamp:

2006-09-20T02:24:42+02:00 (7 years ago)

Author:

moo

Message:

call op_array_ctor handler on restore to be more compatible with other zend_extension

Location:

trunk

Files:

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

trunk/processor/head.m4

@@ -5 +5 @@
 
 #include "php.h"
+#include "zend_extensions.h"
 #include "zend_compile.h"
 #include "zend_API.h"
@@ -19 +20 @@
 extern unsigned int zend_hash_canary;
 #endif
+extern zend_bool xc_have_op_array_ctor;
+static void xc_zend_extension_op_array_ctor_handler(zend_extension *extension, zend_op_array *op_array TSRMLS_DC)
+{
+    if (extension->op_array_ctor) {
+        extension->op_array_ctor(op_array);
+    }
+}
 
 define(`SIZEOF_zend_uint', `sizeof(zend_uint)')

trunk/processor/processor.m4

@@ -474 +474 @@
         STRUCT_P(HashTable, static_variables, HashTable_zval_ptr)
         define(`SKIPASSERT_ONCE')
-
-    IFRESTORE(`
-#ifdef ZEND_ENGINE_2
-        if (dst->scope) {
-            dst->scope = xc_get_class(processor, (zend_ulong) dst->scope);
-            xc_fix_method(processor, dst);
-        }
-#endif
-    ')
-
     }
     else
@@ -496 +486 @@
     PROC_ZSTRING(, function_name)
 #ifdef ZEND_ENGINE_2
-    IFRESTORE(`
-        if (dst->scope) {
-            dst->scope = xc_get_class(processor, (zend_ulong) dst->scope);
-            xc_fix_method(processor, dst);
-        }
-        DONE(scope)
-    ', `
-        PROC_CLASS_ENTRY_P(scope)
-    ')
     DISPATCH(zend_uint, fn_flags)
     dnl mark it as -1 on store, and lookup parent on restore
@@ -637 +618 @@
 #endif
     } while (0);
+
+    IFRESTORE(`
+#ifdef ZEND_ENGINE_2
+        if (dst->scope) {
+            dst->scope = xc_get_class(processor, (zend_ulong) dst->scope);
+            xc_fix_method(processor, dst);
+        }
+        DONE(scope)
+#endif
+    ', `
+#ifdef ZEND_ENGINE_2
+        PROC_CLASS_ENTRY_P(scope)
+#endif
+    ')
+
+    IFRESTORE(`
+        if (xc_have_op_array_ctor) {
+            zend_llist_apply_with_argument(&zend_extensions, (llist_apply_with_arg_func_t) xc_zend_extension_op_array_ctor_handler, dst TSRMLS_CC);
+        }
+    ')
 ')
 dnl }}}

trunk/xcache.c

@@ -96 +96 @@
 static zend_bool xc_test = 0;
 static zend_bool xc_readonly_protection = 0;
+
+zend_bool xc_have_op_array_ctor = 0;
 
 static zend_bool xc_module_gotup = 0;
@@ -2281 +2283 @@
 {
     char *env;
+    zend_extension *ext;
+    zend_llist_position lpos;
 
     xc_module_gotup = 1;
@@ -2289 +2293 @@
         }
     }
+
+    /* cache if there's an op_array_ctor */
+    for (ext = zend_llist_get_first_ex(&zend_extensions, &lpos);
+            ext;
+            ext = zend_llist_get_next_ex(&zend_extensions, &lpos)) {
+        if (ext->op_array_ctor) {
+            xc_have_op_array_ctor = 1;
+            break;
+        }
+    }
+
 
 #ifndef PHP_GINIT