Changeset 378

Timestamp:

2007-05-07T19:21:35+02:00 (6 years 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)
• NEWS (modified) (1 diff)
• utils.c (modified) (5 diffs)
• utils.h (modified) (1 diff)
• xcache.c (modified) (3 diffs)
• xcache_globals.h (modified) (1 diff)

branches/1.2/NEWS

@@ -8 +8 @@
  * #86: remove/edit variable in admin page
  * fixed #77: hits/misses was not updated
+ * fixed #59: pass by reference for internal function was broken
  * fixed #56: xcache_set segfaults when xcache.var_size=0
  

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) {

branches/1.2/utils.h

@@ -53 +53 @@
     HashTable tmp_class_table;
     HashTable tmp_auto_globals;
+    Bucket    *tmp_internal_function_tail;
+    Bucket    *tmp_internal_class_tail;
 } xc_sandbox_t;
 
+void xc_zend_class_add_ref(zend_class_entry ZESW(*ce, **ce));
 xc_sandbox_t *xc_sandbox_init(xc_sandbox_t *sandbox, char *filename TSRMLS_DC);
 void xc_sandbox_free(xc_sandbox_t *sandbox, int install TSRMLS_DC);

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);
 }
 /* }}} */

branches/1.2/xcache_globals.h

@@ -16 +16 @@
     long   var_ttl;
     zend_bool auth_enabled;
+
+    HashTable internal_function_table;
+    HashTable internal_class_table;
 ZEND_END_MODULE_GLOBALS(xcache)