Changeset 622 for branches/1.3/xcache.c

Timestamp:

07/05/2009 10:18:06 AM (4 years ago)

Author:

moo

Message:

merged r504:513 from trunk

Location:

branches/1.3

Files:

• . (modified) (1 prop)
• xcache.c (modified) (12 diffs)

branches/1.3/xcache.c

@@ -556 +556 @@
         xc_constinfo_t *ci = &p->constinfos[i];
         xc_install_constant(xce->name.str.val, &ci->constant,
-                UNISW(0, ci->type), ci->key, ci->key_size TSRMLS_CC);
+                UNISW(0, ci->type), ci->key, ci->key_size, ci->h TSRMLS_CC);
     }
 #endif
@@ -564 +564 @@
         xc_funcinfo_t  *fi = &p->funcinfos[i];
         xc_install_function(xce->name.str.val, &fi->func,
-                UNISW(0, fi->type), fi->key, fi->key_size TSRMLS_CC);
+                UNISW(0, fi->type), fi->key, fi->key_size, fi->h TSRMLS_CC);
     }
 
@@ -581 +581 @@
 #endif
         xc_install_class(xce->name.str.val, &ci->cest, ci->oplineno,
-                UNISW(0, ci->type), ci->key, ci->key_size TSRMLS_CC);
+                UNISW(0, ci->type), ci->key, ci->key_size, ci->h TSRMLS_CC);
     }
 
@@ -590 +590 @@
         /*
         zend_auto_global *auto_global;
-        if (zend_u_hash_find(CG(auto_globals), aginfo->type, aginfo->key, aginfo->key_len+1, (void **) &auto_global)==SUCCESS) {
+        if (zend_u_hash_quick_find(CG(auto_globals), aginfo->type, aginfo->key, aginfo->key_len+1, aginfo->h, (void **) &auto_global)==SUCCESS) {
             if (auto_global->armed) {
                 auto_global->armed = auto_global->auto_global_callback(auto_global->name, auto_global->name_len TSRMLS_CC);
@@ -1064 +1064 @@
         }                                                     \
         data->key_size   = b->nKeyLength;                     \
+        data->h          = b->h;                              \
     }                                                         \
 } while(0)
@@ -1096 +1097 @@
                 }
                 data->key_len = b->nKeyLength - 1;
+                data->h       = b->h;
             }
         }
@@ -1266 +1268 @@
 /* }}} */
 
+#ifdef ZEND_ENGINE_2
 /* {{{ xc_gc_op_array_t */
 typedef struct {
@@ -1277 +1280 @@
     gc_op_array.num_args = op_array->num_args;
     gc_op_array.arg_info = op_array->arg_info;
+#ifdef ZEND_ENGINE_2
     zend_hash_next_index_insert(&XG(gc_op_arrays), (void *) &gc_op_array, sizeof(gc_op_array), NULL);
+#endif
 }
 /* }}} */
@@ -1295 +1300 @@
 }
 /* }}} */
+#endif
 
 /* module helper function */
@@ -1501 +1507 @@
         zend_hash_destroy(&XG(internal_class_table));
 
-        zend_hash_init_ex(&XG(internal_function_table), 100, NULL, CG(function_table)->pDestructor, 1, 0);
-        zend_hash_init_ex(&XG(internal_class_table),    10,  NULL, CG(class_table)->pDestructor,    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_copy(&XG(internal_class_table), CG(class_table), (copy_ctor_func_t) xc_zend_class_add_ref, &tmp_cest, sizeof(tmp_cest));
+        zend_hash_init_ex(&XG(internal_function_table), 100, NULL, NULL, 1, 0);
+        zend_hash_init_ex(&XG(internal_class_table),    10,  NULL, NULL, 1, 0);
+
+        zend_hash_copy(&XG(internal_function_table), CG(function_table), NULL, &tmp_func, sizeof(tmp_func));
+        zend_hash_copy(&XG(internal_class_table), CG(class_table), NULL, &tmp_cest, sizeof(tmp_cest));
 
         XG(internal_table_copied) = 1;
@@ -1523 +1529 @@
     }
 
+#ifdef ZEND_ENGINE_2
     zend_hash_init(&XG(gc_op_arrays), 32, NULL, xc_gc_op_array, 0);
+#endif
 
 #if PHP_API_VERSION <= 20041225
@@ -1539 +1547 @@
 {
     xc_entry_unholds(TSRMLS_C);
+#ifdef ZEND_ENGINE_2
     zend_hash_destroy(&XG(gc_op_arrays));
+#endif
     xc_gc_expires_php(TSRMLS_C);
     xc_gc_expires_var(TSRMLS_C);