Changeset 640 for trunk/xcache.c

Timestamp:

07/05/2009 04:43:38 PM (4 years ago)

Author:

moo

Message:

copy only internal constant, clean constant on shutdown

Files:

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

trunk/xcache.c

@@ -1854 +1854 @@
 
     if (!XG(internal_table_copied)) {
-#ifdef HAVE_XCACHE_CONSTANT
-        zend_constant tmp_const;
-#endif
         zend_function tmp_func;
         xc_cest_t tmp_cest;
@@ -1867 +1864 @@
 
 #ifdef HAVE_XCACHE_CONSTANT
-        zend_hash_init_ex(&XG(internal_constant_table), 20,  NULL, NULL, 1, 0);
+        zend_hash_init_ex(&XG(internal_constant_table), 20,  NULL, (dtor_func_t) xc_zend_constant_dtor, 1, 0);
 #endif
         zend_hash_init_ex(&XG(internal_function_table), 100, NULL, NULL, 1, 0);
@@ -1873 +1870 @@
 
 #ifdef HAVE_XCACHE_CONSTANT
-        zend_hash_copy(&XG(internal_constant_table), EG(zend_constants), (copy_ctor_func_t) xc_copy_zend_constant, &tmp_const, sizeof(tmp_const));
+        xc_copy_internal_zend_constants(&XG(internal_constant_table), EG(zend_constants));
 #endif
         zend_hash_copy(&XG(internal_function_table), CG(function_table), NULL, &tmp_func, sizeof(tmp_func));
@@ -1934 +1931 @@
 
 #ifdef HAVE_XCACHE_CONSTANT
-    zend_hash_init_ex(&xcache_globals->internal_constant_table, 1, NULL, NULL, 1, 0);
+    zend_hash_init_ex(&xcache_globals->internal_constant_table, 1, NULL, (dtor_func_t) xc_zend_constant_dtor, 1, 0);
 #endif
     zend_hash_init_ex(&xcache_globals->internal_function_table, 1, NULL, NULL, 1, 0);