Changeset 344 for trunk/xcache.c

Timestamp:

02/04/2007 06:22:14 AM (22 months ago)

Author:

moo

Message:

copy internal functions/classes into sandbox, they're needed by compiler

Files:

• trunk/xcache.c (modified) (3 diffs)

trunk/xcache.c

@@ -1025 +1025 @@
         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);                     \
@@ -1603 +1605 @@
     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), NULL, &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), NULL, &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));
@@ -1676 +1688 @@
         xcache_globals->var_holds = NULL;
     }
+
+    zend_hash_destroy(&xcache_globals->internal_function_table);
+    zend_hash_destroy(&xcache_globals->internal_class_table);
 }
 /* }}} */