Changeset 622 for branches/1.3/utils.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)
• utils.c (modified) (11 diffs)

branches/1.3/utils.c

@@ -425 +425 @@
 
 #ifdef HAVE_XCACHE_CONSTANT
-void xc_install_constant(char *filename, zend_constant *constant, zend_uchar type, zstr key, uint len TSRMLS_DC) /* {{{ */
+void xc_install_constant(char *filename, zend_constant *constant, zend_uchar type, zstr key, uint len, ulong h TSRMLS_DC) /* {{{ */
 {
     if (zend_u_hash_add(EG(zend_constants), type, key, len,
@@ -445 +445 @@
 /* }}} */
 #endif
-void xc_install_function(char *filename, zend_function *func, zend_uchar type, zstr key, uint len TSRMLS_DC) /* {{{ */
+void xc_install_function(char *filename, zend_function *func, zend_uchar type, zstr key, uint len, ulong h TSRMLS_DC) /* {{{ */
 {
     zend_bool istmpkey;
@@ -475 +475 @@
 }
 /* }}} */
-ZESW(xc_cest_t *, void) xc_install_class(char *filename, xc_cest_t *cest, int oplineno, zend_uchar type, zstr key, uint len TSRMLS_DC) /* {{{ */
+ZESW(xc_cest_t *, void) xc_install_class(char *filename, xc_cest_t *cest, int oplineno, zend_uchar type, zstr key, uint len, ulong h TSRMLS_DC) /* {{{ */
 {
     zend_bool istmpkey;
@@ -487 +487 @@
 #endif
     if (istmpkey) {
-        zend_u_hash_update(CG(class_table), type, key, len,
+        zend_u_hash_quick_update(CG(class_table), type, key, len, h,
                     cest, sizeof(xc_cest_t),
                     ZESW(&stored_ce_ptr, NULL)
@@ -495 +495 @@
         }
     }
-    else if (zend_u_hash_add(CG(class_table), type, key, len,
+    else if (zend_u_hash_quick_add(CG(class_table), type, key, len, h,
                 cest, sizeof(xc_cest_t),
                 ZESW(&stored_ce_ptr, NULL)
@@ -541 +541 @@
 #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) /* {{{ */
 {
@@ -592 +583 @@
     {
         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));
+        zend_hash_copy(&TG(function_table), &XG(internal_function_table), NULL, (void *) &tmp_func, sizeof(tmp_func));
     }
     TG(internal_function_tail) = TG(function_table).pListTail;
@@ -601 +592 @@
     {
         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));
+        zend_hash_copy(&TG(class_table), &XG(internal_class_table), NULL, (void *) &tmp_cest, sizeof(tmp_cest));
     }
 #endif
@@ -645 +636 @@
         zend_constant *c = (zend_constant*) b->pData;
         xc_install_constant(sandbox->filename, c,
-                BUCKET_KEY_TYPE(b), ZSTR(BUCKET_KEY_S(b)), b->nKeyLength TSRMLS_CC);
+                BUCKET_KEY_TYPE(b), ZSTR(BUCKET_KEY_S(b)), b->nKeyLength, b->h TSRMLS_CC);
         b = b->pListNext;
     }
@@ -655 +646 @@
         zend_function *func = (zend_function*) b->pData;
         xc_install_function(sandbox->filename, func,
-                BUCKET_KEY_TYPE(b), ZSTR(BUCKET_KEY_S(b)), b->nKeyLength TSRMLS_CC);
+                BUCKET_KEY_TYPE(b), ZSTR(BUCKET_KEY_S(b)), b->nKeyLength, b->h TSRMLS_CC);
         b = b->pListNext;
     }
@@ -663 +654 @@
     while (b != NULL) {
         xc_install_class(sandbox->filename, (xc_cest_t*) b->pData, -1,
-                BUCKET_KEY_TYPE(b), ZSTR(BUCKET_KEY_S(b)), b->nKeyLength TSRMLS_CC);
+                BUCKET_KEY_TYPE(b), ZSTR(BUCKET_KEY_S(b)), b->nKeyLength, b->h TSRMLS_CC);
         b = b->pListNext;
     }