clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 18:07:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Optimized array functions utilizing php_splice().

Browse Source
This commit is contained in:
Ilia Alshanetsky 2006-11-12 17:13:22 +00:00
parent d3bda9a516
commit e0d385a328
2 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -15,6 +15,7 @@ PHP NEWS
- Streams optimization (Dmitry)
. removed unnecessary ftell() calls (one call for each included PHP file)
. disabled calls to read() after EOF
- Optimized array functions utilizing php_splice(). (Ilia)
- VCWD_REALPATH() is improved to use realpath cache without VIRTUAL_DIR.
(Dmitry)
- ext/bcmath intialization code is moved from request startup to module

20
ext/standard/array.c
View File

@ -1874,7 +1874,7 @@ HashTable* php_splice(HashTable *in_hash, int offset, int length,
/* Update output hash depending on key type */
if (p->nKeyLength)
zend_hash_update(out_hash, p->arKey, p->nKeyLength, &entry, sizeof(zval *), NULL);
zend_hash_quick_update(out_hash, p->arKey, p->nKeyLength, p->h, &entry, sizeof(zval *), NULL);
else
zend_hash_next_index_insert(out_hash, &entry, sizeof(zval *), NULL);
}
@ -1885,7 +1885,7 @@ HashTable* php_splice(HashTable *in_hash, int offset, int length,
entry = *((zval **)p->pData);
entry->refcount++;
if (p->nKeyLength)
zend_hash_update(*removed, p->arKey, p->nKeyLength, &entry, sizeof(zval *), NULL);
zend_hash_quick_update(*removed, p->arKey, p->nKeyLength, p->h, &entry, sizeof(zval *), NULL);
else
zend_hash_next_index_insert(*removed, &entry, sizeof(zval *), NULL);
}
@ -1897,17 +1897,7 @@ HashTable* php_splice(HashTable *in_hash, int offset, int length,
/* ..for each one, create a new zval, copy entry into it and copy it into the output hash */
for (i=0; i<list_count; i++) {
entry = *list[i];
if (entry->refcount>=1000) {
zval *tmp = (zval *) emalloc(sizeof(zval));
*tmp = *entry;
zval_copy_ctor(tmp);
tmp->refcount = 1;
tmp->is_ref = 0;
entry = tmp;
} else {
entry->refcount++;
}
entry->refcount++;
zend_hash_next_index_insert(out_hash, &entry, sizeof(zval *), NULL);
}
}
@ -1917,7 +1907,7 @@ HashTable* php_splice(HashTable *in_hash, int offset, int length,
entry = *((zval **)p->pData);
entry->refcount++;
if (p->nKeyLength)
zend_hash_update(out_hash, p->arKey, p->nKeyLength, &entry, sizeof(zval *), NULL);
zend_hash_quick_update(out_hash, p->arKey, p->nKeyLength, p->h, &entry, sizeof(zval *), NULL);
else
zend_hash_next_index_insert(out_hash, &entry, sizeof(zval *), NULL);
}
@ -2212,7 +2202,7 @@ PHP_FUNCTION(array_slice)
/* Get the arguments and do error-checking */
argc = ZEND_NUM_ARGS();
if (argc < 2 || argc > 4 || zend_get_parameters_ex(argc, &input, &offset, &length, &z_preserve_keys)) {
WRONG_PARAM_COUNT;
WRONG_PARA¬M_COUNT;
}
if (Z_TYPE_PP(input) != IS_ARRAY) {