Changeset 268 for trunk/utils.c

Timestamp:

2006-10-29T03:05:01+01:00 (7 years ago)

Author:

moo

Message:

full compatible with auto_globals_jit, no need to disable it from now on

File:

• trunk/utils.c (modified) (7 diffs)

trunk/utils.c

@@ -511 +511 @@
 #define OG(x) (sandbox->orig_##x)
 /* }}} */
+#ifdef ZEND_ENGINE_2_1
+static zend_bool xc_auto_global_callback(char *name, uint name_len TSRMLS_DC) /* {{{ */
+{
+    zend_auto_global *auto_global;
+    if (zend_u_hash_find(CG(auto_globals), UG(unicode) ? IS_UNICODE : IS_STRING, ZSTR(name), name_len + 1, (void **) &auto_global) == FAILURE) {
+        return 1;
+    }
+    return 0;
+}
+/* }}} */
+static int xc_auto_global_arm(zend_auto_global *auto_global TSRMLS_DC) /* {{{ */
+{
+    if (auto_global->auto_global_callback) {
+        auto_global->armed = 1;
+        auto_global->auto_global_callback = xc_auto_global_callback;
+    }
+    else {
+        auto_global->armed = 0;
+    }
+    return ZEND_HASH_APPLY_KEEP;
+}
+/* }}} */
+#endif
 xc_sandbox_t *xc_sandbox_init(xc_sandbox_t *sandbox, char *filename TSRMLS_DC) /* {{{ */
 {
@@ -535 +558 @@
     EG(class_table) = CG(class_table);
 
+#ifdef ZEND_ENGINE_2_1
+    OG(auto_globals) = CG(auto_globals);
+    CG(auto_globals) = &TG(auto_globals);
+#endif
+
     TG(included_files) = &EG(included_files);
 
@@ -543 +571 @@
     zend_hash_init_ex(&TG(function_table), 128, NULL, OG(function_table)->pDestructor, 0, 0);
     zend_hash_init_ex(&TG(class_table), 16, NULL, OG(class_table)->pDestructor, 0, 0);
+#ifdef ZEND_ENGINE_2_1
+    zend_hash_init_ex(&TG(auto_globals), 8, NULL, OG(auto_globals)->pDestructor, 0, 0);
+    {
+        zend_auto_global tmp_autoglobal;
+
+        zend_hash_copy(&TG(auto_globals), OG(auto_globals), NULL, (void *) &tmp_autoglobal, sizeof(tmp_autoglobal));
+        zend_hash_apply(&TG(auto_globals), (apply_func_t) xc_auto_global_arm TSRMLS_CC);
+    }
+#endif
 
     sandbox->filename = filename;
@@ -592 +629 @@
         b = b->pListNext;
     }
+
+#ifdef ZEND_ENGINE_2_1
+    /* trigger auto_globals jit */
+    for (b = TG(auto_globals).pListHead; b != NULL; b = b->pListNext) {
+        zend_auto_global *auto_global = (zend_auto_global *) b->pData;
+        /* check if actived */
+        if (auto_global->auto_global_callback && !auto_global->armed) {
+            zend_u_is_auto_global(BUCKET_KEY_TYPE(b), ZSTR(BUCKET_KEY_S(b)), auto_global->name_len TSRMLS_CC);
+        }
+    }
+#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);
@@ -609 +658 @@
     CG(class_table)    = OG(class_table);
     EG(class_table)    = CG(class_table);
+#ifdef ZEND_ENGINE_2_1
+    CG(auto_globals)   = OG(auto_globals);
+#endif
 
     if (install) {
@@ -624 +676 @@
         TG(function_table).pDestructor = NULL;
         TG(class_table).pDestructor = NULL;
+#ifdef ZEND_ENGINE_2_1
+        TG(auto_globals).pDestructor = NULL;
+#endif
     }
 
@@ -632 +687 @@
     zend_hash_destroy(&TG(function_table));
     zend_hash_destroy(&TG(class_table));
+#ifdef ZEND_ENGINE_2_1
+    zend_hash_destroy(&TG(auto_globals));
+#endif
     zend_hash_destroy(TG(included_files));