archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-19 17:04:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Optimizations

Browse source
This commit is contained in:
Marcus Boerger 2003-05-25 01:36:50 +00:00
parent e8dba2cba1
commit 21bbfb503e
1 changed files with 40 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

52
ext/spl/spl_foreach.c
View file

@ -31,6 +31,8 @@
#include "spl_engine.h" #include "spl_engine.h"
#include "spl_foreach.h" #include "spl_foreach.h"
#define OPTIMIZED_ARRAY_CONSTRUCT
#define ezalloc(size) \ #define ezalloc(size) \
memset(emalloc(size), 0, size) memset(emalloc(size), 0, size)
@ -79,12 +81,11 @@ ZEND_EXECUTE_HOOK_FUNCTION(ZEND_FE_RESET)
} }
/* }}} */ /* }}} */
/* {{{ OPTIMIZED_ARRAY_CONSTRUCT macros */
#ifdef OPTIMIZED_ARRAY_CONSTRUCT
#define CONNECT_TO_BUCKET_DLLIST(element, list_head) \ #define CONNECT_TO_BUCKET_DLLIST(element, list_head) \
(element)->pNext = (list_head); \ (element)->pNext = (list_head); \
(element)->pLast = NULL; \ (element)->pLast = NULL;
if ((element)->pNext) { \
(element)->pNext->pLast = (element); \
}
#define CONNECT_TO_GLOBAL_DLLIST(element, ht) \ #define CONNECT_TO_GLOBAL_DLLIST(element, ht) \
(element)->pListLast = (ht)->pListTail; \ (element)->pListLast = (ht)->pListTail; \
@ -99,6 +100,8 @@ ZEND_EXECUTE_HOOK_FUNCTION(ZEND_FE_RESET)
if ((ht)->pInternalPointer == NULL) { \ if ((ht)->pInternalPointer == NULL) { \
(ht)->pInternalPointer = (element); \ (ht)->pInternalPointer = (element); \
} }
#endif
/* }}} */
/* {{{ ZEND_EXECUTE_HOOK_FUNCTION(ZEND_FE_FETCH) */ /* {{{ ZEND_EXECUTE_HOOK_FUNCTION(ZEND_FE_FETCH) */
ZEND_EXECUTE_HOOK_FUNCTION(ZEND_FE_FETCH) ZEND_EXECUTE_HOOK_FUNCTION(ZEND_FE_FETCH)
@ -129,7 +132,6 @@ ZEND_EXECUTE_HOOK_FUNCTION(ZEND_FE_FETCH)
spl_begin_method_call_this(obj, proxy->obj_ce, &proxy->f_more, "has_more", sizeof("has_more")-1, &more TSRMLS_CC); spl_begin_method_call_this(obj, proxy->obj_ce, &proxy->f_more, "has_more", sizeof("has_more")-1, &more TSRMLS_CC);
if (zend_is_true(&more)) { if (zend_is_true(&more)) {
result = &EX_T(EX(opline)->result.u.var).tmp_var; result = &EX_T(EX(opline)->result.u.var).tmp_var;
array_init(result);
spl_begin_method_call_ex(obj, proxy->obj_ce, &proxy->f_current, "current", sizeof("current")-1, &value TSRMLS_CC); spl_begin_method_call_ex(obj, proxy->obj_ce, &proxy->f_current, "current", sizeof("current")-1, &value TSRMLS_CC);
@ -140,31 +142,57 @@ ZEND_EXECUTE_HOOK_FUNCTION(ZEND_FE_FETCH)
key->value.lval = proxy->index; key->value.lval = proxy->index;
key->type = IS_LONG; key->type = IS_LONG;
} }
#ifndef OPTIMIZED_ARRAY_CONSTRUCT
array_init(result);
zend_hash_index_update(result->value.ht, 0, &value, sizeof(zval *), NULL); zend_hash_index_update(result->value.ht, 0, &value, sizeof(zval *), NULL);
zend_hash_index_update(result->value.ht, 1, &key, sizeof(zval *), NULL); zend_hash_index_update(result->value.ht, 1, &key, sizeof(zval *), NULL);
/* #else
{ {
Bucket *p; Bucket *p;
HashTable *ht;
ht = emalloc(sizeof(HashTable));
result->value.ht = ht;
ht->nTableSize = 1 << 1;
ht->nTableMask = ht->nTableSize - 1;
#if ZEND_DEBUG
ht->inconsistent = 0; /*HT_OK;*/
#endif
ht->arBuckets = (Bucket **)emalloc(ht->nTableSize * sizeof(Bucket *));
ht->pDestructor = ZVAL_PTR_DTOR;
ht->pListHead = NULL;
ht->pListTail = NULL;
ht->nNumOfElements = 0;
ht->nNextFreeElement = 0;
ht->pInternalPointer = NULL;
ht->persistent = 0;
ht->nApplyCount = 0;
ht->bApplyProtection = 1;
result->type = IS_ARRAY;
p = (Bucket*)emalloc(sizeof(Bucket)-1); p = (Bucket*)emalloc(sizeof(Bucket)-1);
p->pDataPtr = value; p->pDataPtr = value;
p->pData = &p->pDataPtr; p->pData = &p->pDataPtr;
p->nKeyLength = 0; p->nKeyLength = 0;
p->h = 0; p->h = 0;
CONNECT_TO_BUCKET_DLLIST(p, result->value.ht->arBuckets[0]);
result->value.ht->arBuckets[0] = p; result->value.ht->arBuckets[0] = p;
CONNECT_TO_GLOBAL_DLLIST(p, result->value.ht); CONNECT_TO_BUCKET_DLLIST(p, ht->arBuckets[0]);
CONNECT_TO_GLOBAL_DLLIST(p, ht);
p = (Bucket*)emalloc(sizeof(Bucket)-1); p = (Bucket*)emalloc(sizeof(Bucket)-1);
p->pDataPtr = key; p->pDataPtr = key;
p->pData = &p->pDataPtr; p->pData = &p->pDataPtr;
p->nKeyLength = 0; p->nKeyLength = 0;
p->h = 1; p->h = 1;
CONNECT_TO_BUCKET_DLLIST(p, result->value.ht->arBuckets[1]);
result->value.ht->arBuckets[1] = p; result->value.ht->arBuckets[1] = p;
CONNECT_TO_GLOBAL_DLLIST(p, result->value.ht); CONNECT_TO_BUCKET_DLLIST(p, ht->arBuckets[1]);
result->value.ht->nNumOfElements = 2; CONNECT_TO_GLOBAL_DLLIST(p, ht);
ht->nNumOfElements = 2;
} }
*/ #endif
NEXT_OPCODE(); NEXT_OPCODE();
} }
efree(proxy); efree(proxy);