archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

- Improve startup speed a bit by using the hash_*_ptr() functions

Browse source
This commit is contained in:
Andi Gutmans 2000-02-13 13:25:01 +00:00
parent bb302a755c
commit 3811b58a7d
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

10
main/main.c
View file

@ -922,7 +922,7 @@ static inline void php_register_server_variables(ELS_D SLS_DC PLS_DC)
ALLOC_ZVAL(array_ptr); ALLOC_ZVAL(array_ptr);
array_init(array_ptr); array_init(array_ptr);
INIT_PZVAL(array_ptr); INIT_PZVAL(array_ptr);
zend_hash_add(&EG(symbol_table), "HTTP_SERVER_VARS", sizeof("HTTP_SERVER_VARS"), &array_ptr, sizeof(pval *),NULL); zend_hash_add_ptr(&EG(symbol_table), "HTTP_SERVER_VARS", sizeof("HTTP_SERVER_VARS"), array_ptr, sizeof(pval *),NULL);
} }
/* Server variables */ /* Server variables */
@ -1053,8 +1053,8 @@ static void php_build_argv(char *s, zval *track_vars_array ELS_DC PLS_DC)
INIT_PZVAL(argc); INIT_PZVAL(argc);
if (PG(register_globals)) { if (PG(register_globals)) {
zend_hash_update(&EG(symbol_table), "argv", sizeof("argv"), &arr, sizeof(pval *), NULL); zend_hash_update_ptr(&EG(symbol_table), "argv", sizeof("argv"), arr, sizeof(pval *), NULL);
zend_hash_add(&EG(symbol_table), "argc", sizeof("argc"), &argc, sizeof(pval *), NULL); zend_hash_add_ptr(&EG(symbol_table), "argc", sizeof("argc"), argc, sizeof(pval *), NULL);
} }
if (PG(track_vars)) { if (PG(track_vars)) {
@ -1062,8 +1062,8 @@ static void php_build_argv(char *s, zval *track_vars_array ELS_DC PLS_DC)
arr->refcount++; arr->refcount++;
argc->refcount++; argc->refcount++;
} }
zend_hash_update(track_vars_array->value.ht, "argv", sizeof("argv"), &arr, sizeof(pval *), NULL); zend_hash_update_ptr(track_vars_array->value.ht, "argv", sizeof("argv"), arr, sizeof(pval *), NULL);
zend_hash_update(track_vars_array->value.ht, "argc", sizeof("argc"), &argc, sizeof(pval *), NULL); zend_hash_update_ptr(track_vars_array->value.ht, "argc", sizeof("argc"), argc, sizeof(pval *), NULL);
} }
} }

12
main/php_variables.c
View file

@ -156,7 +156,7 @@ PHPAPI void php_register_variable(char *var, char *val, pval *track_vars_array E
if (!index) { if (!index) {
zend_hash_next_index_insert(symtable1, &gpc_element, sizeof(zval *), (void **) &gpc_element_p); zend_hash_next_index_insert(symtable1, &gpc_element, sizeof(zval *), (void **) &gpc_element_p);
} else { } else {
zend_hash_update(symtable1, index, index_len+1, &gpc_element, sizeof(zval *), (void **) &gpc_element_p); zend_hash_update_ptr(symtable1, index, index_len+1, gpc_element, sizeof(zval *), (void **) &gpc_element_p);
} }
if (!top_gpc_p) { if (!top_gpc_p) {
top_gpc_p = gpc_element_p; top_gpc_p = gpc_element_p;
@ -168,7 +168,7 @@ PHPAPI void php_register_variable(char *var, char *val, pval *track_vars_array E
if (top_gpc_p) { if (top_gpc_p) {
(*top_gpc_p)->is_ref = 1; (*top_gpc_p)->is_ref = 1;
if (symtable2) { if (symtable2) {
zend_hash_update(symtable2, var, var_len+1, top_gpc_p, sizeof(zval *), NULL); zend_hash_update_ptr(symtable2, var, var_len+1, *top_gpc_p, sizeof(zval *), NULL);
(*top_gpc_p)->refcount++; (*top_gpc_p)->refcount++;
} }
} }
@ -192,13 +192,13 @@ void php_treat_data(int arg, char *str ELS_DC PLS_DC SLS_DC)
INIT_PZVAL(array_ptr); INIT_PZVAL(array_ptr);
switch (arg) { switch (arg) {
case PARSE_POST: case PARSE_POST:
zend_hash_add(&EG(symbol_table), "HTTP_POST_VARS", sizeof("HTTP_POST_VARS"), &array_ptr, sizeof(pval *),NULL); zend_hash_add_ptr(&EG(symbol_table), "HTTP_POST_VARS", sizeof("HTTP_POST_VARS"), array_ptr, sizeof(pval *),NULL);
break; break;
case PARSE_GET: case PARSE_GET:
zend_hash_add(&EG(symbol_table), "HTTP_GET_VARS", sizeof("HTTP_GET_VARS"), &array_ptr, sizeof(pval *),NULL); zend_hash_add_ptr(&EG(symbol_table), "HTTP_GET_VARS", sizeof("HTTP_GET_VARS"), array_ptr, sizeof(pval *),NULL);
break; break;
case PARSE_COOKIE: case PARSE_COOKIE:
zend_hash_add(&EG(symbol_table), "HTTP_COOKIE_VARS", sizeof("HTTP_COOKIE_VARS"), &array_ptr, sizeof(pval *),NULL); zend_hash_add_ptr(&EG(symbol_table), "HTTP_COOKIE_VARS", sizeof("HTTP_COOKIE_VARS"), array_ptr, sizeof(pval *),NULL);
break; break;
} }
} else { } else {
@ -294,7 +294,7 @@ void php_import_environment_variables(ELS_D PLS_DC)
ALLOC_ZVAL(array_ptr); ALLOC_ZVAL(array_ptr);
array_init(array_ptr); array_init(array_ptr);
INIT_PZVAL(array_ptr); INIT_PZVAL(array_ptr);
zend_hash_add(&EG(symbol_table), "HTTP_ENV_VARS", sizeof("HTTP_ENV_VARS"), &array_ptr, sizeof(pval *),NULL); zend_hash_add_ptr(&EG(symbol_table), "HTTP_ENV_VARS", sizeof("HTTP_ENV_VARS"), array_ptr, sizeof(pval *),NULL);
} }
for (env = environ; env != NULL && *env != NULL; env++) { for (env = environ; env != NULL && *env != NULL; env++) {