cvs: ZendEngine2(PHP_5_2) / zend_hash.c

dmitry Wed Nov 8 16:02:03 2006 UTC Modified files: (Branch: PHP_5_2) /ZendEngine2 zend_hash.c Log: HashTable copying optimization (Matt Wilmas) http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_hash.c?r1=1.121.2.4.2.2&r2=1.121.2.4.2.3&diff_format=u Index: ZendEngine2/zend_hash.c diff -u ZendEngine2/zend_hash.c:1.121.2.4.2.2 ZendEngine2/zend_hash.c:1.121.2.4.2.3 --- ZendEngine2/zend_hash.c:1.121.2.4.2.2 Fri Nov 3 19:02:16 2006 +++ ZendEngine2/zend_hash.c Wed Nov 8 16:02:03 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_hash.c,v 1.121.2.4.2.2 2006/11/03 19:02:16 helly Exp $ */ +/* $Id: zend_hash.c,v 1.121.2.4.2.3 2006/11/08 16:02:03 dmitry Exp $ */ #include "zend.h" @@ -773,7 +773,7 @@ p = source->pListHead; while (p) { if (p->nKeyLength) { - zend_hash_update(target, p->arKey, p->nKeyLength, p->pData, size, &new_entry); + zend_hash_quick_update(target, p->arKey, p->nKeyLength, p->h, p->pData, size, &new_entry); } else { zend_hash_index_update(target, p->h, p->pData, size, &new_entry); } @@ -798,7 +798,7 @@ p = source->pListHead; while (p) { if (p->nKeyLength>0) { - if (_zend_hash_add_or_update(target, p->arKey, p->nKeyLength, p->pData, size, &t, mode ZEND_FILE_LINE_RELAY_CC)==SUCCESS && pCopyConstructor) { + if (_zend_hash_quick_add_or_update(target, p->arKey, p->nKeyLength, p->h, p->pData, size, &t, mode ZEND_FILE_LINE_RELAY_CC)==SUCCESS && pCopyConstructor) { pCopyConstructor(t); } } else {