Changeset 506 for trunk/utils.c

Timestamp:

01/05/2008 04:45:48 AM (11 months ago)

Author:

moo

Message:

optimized function_table/class_table by caching hash value

Files:

• trunk/utils.c (modified) (8 diffs)

trunk/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)
@@ -685 +685 @@
         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;
     }
@@ -695 +695 @@
         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;
     }
@@ -703 +703 @@
     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;
     }