com php-src: Split and optimize loop: Zend/zend_hash.c
| From: | Dmitry Stogov | Date: | Tue, 26 Aug 2014 20:52:50 +0000 |
| Subject: | com php-src: Split and optimize loop: Zend/zend_hash.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-81133@lists.php.net to get a copy of this message | ||
Commit: 219794e1cd51e43af0a1155c294f735b9d9e9de4
Author: Dmitry Stogov <dmitry@zend.com> Wed, 27 Aug 2014 00:52:50 +0400
Parents: 49b4e12e54bdf915c81b9a6eae1d98b8f95d365d
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=219794e1cd51e43af0a1155c294f735b9d9e9de4
Log:
Split and optimize loop
Changed paths:
M Zend/zend_hash.c
Diff:
diff --git a/Zend/zend_hash.c b/Zend/zend_hash.c
index 9dd5a41..5201e88 100644
--- a/Zend/zend_hash.c
+++ b/Zend/zend_hash.c
@@ -886,28 +886,49 @@ ZEND_API int zend_hash_index_del(HashTable *ht, zend_ulong h)
ZEND_API void zend_hash_destroy(HashTable *ht)
{
- uint idx;
- Bucket *p;
+ Bucket *p, *end;
IS_CONSISTENT(ht);
- SET_INCONSISTENT(HT_IS_DESTROYING);
-
- for (idx = 0 ; idx < ht->nNumUsed; idx++) {
- p = ht->arData + idx;
- if (Z_TYPE(p->val) == IS_UNDEF) continue;
+ if (ht->nNumUsed) {
+ p = ht->arData;
+ end = p + ht->nNumUsed;
if (ht->pDestructor) {
- ht->pDestructor(&p->val);
- }
- if (p->key) {
- zend_string_release(p->key);
+ SET_INCONSISTENT(HT_IS_DESTROYING);
+
+ if (ht->u.flags & HASH_FLAG_PACKED) {
+ do {
+ if (EXPECTED(Z_TYPE(p->val) != IS_UNDEF)) {
+ ht->pDestructor(&p->val);
+ }
+ } while (++p != end);
+ } else {
+ do {
+ if (EXPECTED(Z_TYPE(p->val) != IS_UNDEF)) {
+ ht->pDestructor(&p->val);
+ if (EXPECTED(p->key)) {
+ zend_string_release(p->key);
+ }
+ }
+ } while (++p != end);
+ }
+
+ SET_INCONSISTENT(HT_DESTROYED);
+ } else {
+ if (!(ht->u.flags & HASH_FLAG_PACKED)) {
+ do {
+ if (EXPECTED(Z_TYPE(p->val) != IS_UNDEF)) {
+ if (EXPECTED(p->key)) {
+ zend_string_release(p->key);
+ }
+ }
+ } while (++p != end);
+ }
}
+ } else if (EXPECTED(!ht->nTableMask)) {
+ return;
}
- if (ht->nTableMask) {
- pefree(ht->arData, ht->u.flags & HASH_FLAG_PERSISTENT);
- }
-
- SET_INCONSISTENT(HT_DESTROYED);
+ pefree(ht->arData, ht->u.flags & HASH_FLAG_PERSISTENT);
}