Skip to content

Commit 25bf9be

Browse files
Speed up zend_hash_iterator_add() when iterators are nested
zend_hash_iterator_add() scanned EG(ht_iterators) from slot 0 on every call, so each nested foreach by reference, foreach over object properties, ArrayIterator or array_walk() paid one probe per iterator already alive. EG(ht_iterators_free_hint) tracks that all slots below it are in use: zend_hash_iterator_add() starts looking from there and zend_hash_iterator_del() lowers it. The returned slot is still the lowest free one, so slot indexes and EG(ht_iterators_used) are the same as before.
1 parent e256041 commit 25bf9be

5 files changed

Lines changed: 21 additions & 6 deletions

File tree

‎NEWS‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@ PHP NEWS
22
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
33
?? ??? ????, PHP 8.7.0alpha1
44

5+
- Core:
6+
. Improved performance of hash table iterators when several are alive, as in
7+
nested foreach by reference. (Nicolas Grekas)
8+
59
- FPM:
610
. Use recommended TYPE, HELP order for OpenMetrics metadata.
711
(Marcel Hernandez)

‎UPGRADING‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,10 @@ PHP 8.7 UPGRADE NOTES
7171
14. Performance Improvements
7272
========================================
7373

74+
- Core:
75+
. Improved performance of hash table iterators when several are alive, as in
76+
nested foreach by reference.
77+
7478
- Standard:
7579
. Improved performance of array_splice() when inserting without removing
7680
elements.

‎Zend/zend_execute_API.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,7 @@ void init_executor(void) /* {{{ */
182182

183183
EG(ht_iterators_count) = sizeof(EG(ht_iterators_slots)) / sizeof(HashTableIterator);
184184
EG(ht_iterators_used) = 0;
185+
EG(ht_iterators_free_hint) = 0;
185186
EG(ht_iterators) = EG(ht_iterators_slots);
186187
memset(EG(ht_iterators), 0, sizeof(EG(ht_iterators_slots)));
187188

‎Zend/zend_globals.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,7 @@ struct _zend_executor_globals {
274274

275275
uint32_t ht_iterators_count; /* number of allocated slots */
276276
uint32_t ht_iterators_used; /* number of used slots */
277+
uint32_t ht_iterators_free_hint; /* no free slot below this one */
277278
HashTableIterator *ht_iterators;
278279
HashTableIterator ht_iterators_slots[16];
279280

‎Zend/zend_hash.c‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -534,25 +534,26 @@ static void zend_hash_remove_iterator_copies(uint32_t idx) {
534534

535535
ZEND_API uint32_t ZEND_FASTCALL zend_hash_iterator_add(HashTable *ht, HashPosition pos)
536536
{
537-
HashTableIterator *iter = EG(ht_iterators);
538-
HashTableIterator *end = iter + EG(ht_iterators_count);
539-
uint32_t idx;
537+
/* Slots below the hint are in use, start looking for a free one from there */
538+
uint32_t idx = EG(ht_iterators_free_hint);
539+
HashTableIterator *iter;
540540

541541
if (EXPECTED(!HT_ITERATORS_OVERFLOW(ht))) {
542542
HT_INC_ITERATORS_COUNT(ht);
543543
}
544-
while (iter != end) {
544+
while (idx < EG(ht_iterators_count)) {
545+
iter = EG(ht_iterators) + idx;
545546
if (iter->ht == NULL) {
546547
iter->ht = ht;
547548
iter->pos = pos;
548-
idx = iter - EG(ht_iterators);
549549
iter->next_copy = idx;
550+
EG(ht_iterators_free_hint) = idx + 1;
550551
if (idx + 1 > EG(ht_iterators_used)) {
551552
EG(ht_iterators_used) = idx + 1;
552553
}
553554
return idx;
554555
}
555-
iter++;
556+
idx++;
556557
}
557558
if (EG(ht_iterators) == EG(ht_iterators_slots)) {
558559
EG(ht_iterators) = emalloc(sizeof(HashTableIterator) * (EG(ht_iterators_count) + 8));
@@ -568,6 +569,7 @@ ZEND_API uint32_t ZEND_FASTCALL zend_hash_iterator_add(HashTable *ht, HashPositi
568569
idx = iter - EG(ht_iterators);
569570
iter->next_copy = idx;
570571
EG(ht_iterators_used) = idx + 1;
572+
EG(ht_iterators_free_hint) = idx + 1;
571573
return idx;
572574
}
573575

@@ -663,6 +665,9 @@ ZEND_API void ZEND_FASTCALL zend_hash_iterator_del(uint32_t idx)
663665
HT_DEC_ITERATORS_COUNT(iter->ht);
664666
}
665667
iter->ht = NULL;
668+
if (idx < EG(ht_iterators_free_hint)) {
669+
EG(ht_iterators_free_hint) = idx;
670+
}
666671

667672
if (UNEXPECTED(iter->next_copy != idx)) {
668673
zend_hash_remove_iterator_copies(idx);

0 commit comments

Comments
 (0)