cvs: ZendEngine2 / zend_hash.c

dmitry Wed Nov 8 16:02:29 2006 UTC Modified files: /ZendEngine2 zend_hash.c Log: HashTable copying optimization (Matt Wilmas) http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_hash.c?r1=1.143&r2=1.144&diff_format=u Index: ZendEngine2/zend_hash.c diff -u ZendEngine2/zend_hash.c:1.143 ZendEngine2/zend_hash.c:1.144 --- ZendEngine2/zend_hash.c:1.143 Wed Nov 1 20:04:19 2006 +++ ZendEngine2/zend_hash.c Wed Nov 8 16:02:29 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_hash.c,v 1.143 2006/11/01 20:04:19 johannes Exp $ */ +/* $Id: zend_hash.c,v 1.144 2006/11/08 16:02:29 dmitry Exp $ */ #include "zend.h" #include "zend_operators.h" @@ -1005,7 +1005,7 @@ if (p->nKeyLength == 0) { zend_hash_index_update(target, p->h, p->pData, size, &new_entry); } else { - zend_u_hash_update(target, p->key.type, ZSTR(p->key.arKey.s), p->nKeyLength, p->pData, size, &new_entry); + zend_u_hash_quick_update(target, p->key.type, ZSTR(p->key.arKey.s), p->nKeyLength, p->h, p->pData, size, &new_entry); } if (pCopyConstructor) { pCopyConstructor(new_entry); @@ -1032,7 +1032,7 @@ pCopyConstructor(t); } } else { - if (_zend_u_hash_add_or_update(target, p->key.type, ZSTR(p->key.arKey.s), p->nKeyLength, p->pData, size, &t, mode ZEND_FILE_LINE_RELAY_CC)==SUCCESS && pCopyConstructor) { + if (_zend_u_hash_quick_add_or_update(target, p->key.type, ZSTR(p->key.arKey.s), p->nKeyLength, p->h, p->pData, size, &t, mode ZEND_FILE_LINE_RELAY_CC)==SUCCESS && pCopyConstructor) { pCopyConstructor(t); } }