Changeset 378 for branches/1.2/xcache.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)
• xcache.c (modified) (3 diffs)

branches/1.2/xcache.c

@@ -1023 +1023 @@
         Bucket *b;
         unsigned int i;
+        unsigned int j;
 
 #define COPY_H(vartype, var, cnt, name, datatype) do {        \
-    for (i = 0; b; i ++, b = b->pListNext) {                  \
-        vartype *data = &php.var[i];                          \
+    for (i = 0, j = 0; b; i ++, b = b->pListNext) {           \
+        vartype *data = &php->var[j];                         \
                                                               \
         if (i < old_##cnt) {                                  \
             continue;                                         \
         }                                                     \
+        j ++;                                                 \
                                                               \
         assert(i < old_##cnt + php.cnt);                      \
@@ -1443 +1445 @@
     int i;
 
+    if (XG(internal_function_table).nTableSize == 0) {
+        zend_function tmp_func;
+        xc_cest_t tmp_cest;
+
+        zend_hash_init_ex(&XG(internal_function_table), 100, NULL, NULL, 1, 0);
+        zend_hash_copy(&XG(internal_function_table), CG(function_table), (copy_ctor_func_t) function_add_ref, &tmp_func, sizeof(tmp_func));
+
+        zend_hash_init_ex(&XG(internal_class_table), 10, NULL, NULL, 1, 0);
+        zend_hash_copy(&XG(internal_class_table), CG(class_table), (copy_ctor_func_t) xc_zend_class_add_ref, &tmp_cest, sizeof(tmp_cest));
+    }
     if (xc_php_hcache.size && !XG(php_holds)) {
         XG(php_holds) = calloc(xc_php_hcache.size, sizeof(xc_stack_t));
@@ -1516 +1528 @@
         xcache_globals->var_holds = NULL;
     }
+
+    zend_hash_destroy(&xcache_globals->internal_function_table);
+    zend_hash_destroy(&xcache_globals->internal_class_table);
 }
 /* }}} */