Changeset 378 for branches/1.2/utils.c

Timestamp:

05/07/2007 05:21:35 PM (19 months ago)

Author:

moo

Message:

merged[344] [345] [346] from trunk->1.2: fixed #59: pass by reference for internal function was broken

Location:

branches/1.2

Files:

• . (modified) (1 prop)
• utils.c (modified) (5 diffs)

branches/1.2/utils.c

@@ -1 +1 @@
 
 #include "xcache.h"
+#include "stack.h"
+#include "xcache_globals.h"
 #include "utils.h"
 #ifdef ZEND_ENGINE_2_1
@@ -534 +536 @@
 /* }}} */
 #endif
+
+void xc_zend_class_add_ref(zend_class_entry ZESW(*ce, **ce))
+{
+#ifdef ZEND_ENGINE_2
+    (*ce)->refcount++;
+#else
+    (*ce->refcount)++;
+#endif
+}
+
 xc_sandbox_t *xc_sandbox_init(xc_sandbox_t *sandbox, char *filename TSRMLS_DC) /* {{{ */
 {
     HashTable *h;
+
     if (sandbox) {
         memset(sandbox, 0, sizeof(sandbox[0]));
@@ -573 +586 @@
     h = OG(function_table);
     zend_hash_init_ex(&TG(function_table), 128, NULL, h->pDestructor, h->persistent, h->bApplyProtection);
+    {
+        zend_function tmp_func;
+        zend_hash_copy(&TG(function_table), &XG(internal_function_table), (copy_ctor_func_t) function_add_ref, (void *) &tmp_func, sizeof(tmp_func));
+    }
+    TG(internal_class_tail) = TG(function_table).pListTail;
+
     h = OG(class_table);
     zend_hash_init_ex(&TG(class_table),     16, NULL, h->pDestructor, h->persistent, h->bApplyProtection);
+#if 0 && TODO
+    {
+        xc_cest_t tmp_cest;
+        zend_hash_copy(&TG(class_table), &XG(internal_class_table), (copy_ctor_func_t) xc_zend_class_add_ref, (void *) &tmp_cest, sizeof(tmp_cest));
+    }
+#endif
+    TG(internal_class_tail) = TG(class_table).pListTail;
+
 #ifdef ZEND_ENGINE_2_1
     /* shallow copy, don't destruct */
@@ -619 +646 @@
 #endif
 
-    b = TG(function_table).pListHead;
+    b = TG(internal_function_tail) ? TG(internal_function_tail)->pListNext : TG(function_table).pListHead;
     /* install function */
     while (b != NULL) {
@@ -628 +655 @@
     }
 
-    b = TG(class_table).pListHead;
+    b = TG(internal_class_tail) ? TG(internal_class_tail)->pListNext : TG(class_table).pListHead;
     /* install class */
     while (b != NULL) {