From: Dmitry Stogov Date: Thu, 8 Jul 2010 14:05:11 +0000 (+0000) Subject: - use interned strings for auto globals X-Git-Tag: php-5.4.0alpha1~191^2~1193 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f0c8366a9e8acd832b6d433035d162218f8db1ec;p=php - use interned strings for auto globals - $GLOBALS became a JIT autoglobal, so it's initialized only if used (this may affect opcode caches) --- diff --git a/NEWS b/NEWS index 06989d3cd6..f2a823ba0b 100644 --- a/NEWS +++ b/NEWS @@ -19,6 +19,8 @@ PHP NEWS instruction without previous ZEND_FETCH_CLASS. . eliminated unnecessary iterations during request startup/shutdown . zend_stack initialization is delayed before the actual usage + . $GLOBALS became a JIT autoglobal, so it's initialized only if used + (this may affect opcode caches) - Added concept of interned strings. All strings constants known at compile time are allocated in a single copy and never changed. (Dmitry) - Added an optimization which saves memory and emalloc/efree calls for empty diff --git a/Zend/micro_bench.php b/Zend/micro_bench.php index 0d705e942b..b67bfcda9a 100644 --- a/Zend/micro_bench.php +++ b/Zend/micro_bench.php @@ -174,6 +174,20 @@ function read_const($n) { } } +function read_auto_global($n) { + for ($i = 0; $i < $n; ++$i) { + $x = $_GET; + } +} + +$g_var = 0; + +function read_global_var($n) { + for ($i = 0; $i < $n; ++$i) { + $x = $GLOBALS['g_var']; + } +} + /*****/ function empty_loop($n) { @@ -282,4 +296,8 @@ create_object(N); $t = end_test($t, 'new Foo()', $overhead); read_const(N); $t = end_test($t, '$x = TEST', $overhead); +read_auto_global(N); +$t = end_test($t, '$x = $_GET', $overhead); +read_global_var(N); +$t = end_test($t, '$x = $GLOBALS[\'v\']', $overhead); total($t0, "Total"); diff --git a/Zend/zend.c b/Zend/zend.c index cdf6dacfbd..4d2cbcaf16 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -593,6 +593,20 @@ static void php_scanner_globals_ctor(zend_php_scanner_globals *scanner_globals_p void zend_init_opcodes_handlers(void); +static zend_bool php_auto_globals_create_globals(char *name, uint name_len TSRMLS_DC) /* {{{ */ +{ + zval *globals; + + ALLOC_ZVAL(globals); + Z_SET_REFCOUNT_P(globals, 1); + Z_SET_ISREF_P(globals); + Z_TYPE_P(globals) = IS_ARRAY; + Z_ARRVAL_P(globals) = &EG(symbol_table); + zend_hash_update(&EG(symbol_table), name, name_len + 1, &globals, sizeof(zval *), NULL); + return 0; +} +/* }}} */ + int zend_startup(zend_utility_functions *utility_functions, char **extensions TSRMLS_DC) /* {{{ */ { #ifdef ZTS @@ -660,7 +674,7 @@ int zend_startup(zend_utility_functions *utility_functions, char **extensions TS zend_hash_init_ex(GLOBAL_FUNCTION_TABLE, 100, NULL, ZEND_FUNCTION_DTOR, 1, 0); zend_hash_init_ex(GLOBAL_CLASS_TABLE, 10, NULL, ZEND_CLASS_DTOR, 1, 0); - zend_hash_init_ex(GLOBAL_AUTO_GLOBALS_TABLE, 8, NULL, (dtor_func_t) zend_auto_global_dtor, 1, 0); + zend_hash_init_ex(GLOBAL_AUTO_GLOBALS_TABLE, 8, NULL, NULL, 1, 0); zend_hash_init_ex(GLOBAL_CONSTANTS_TABLE, 20, NULL, ZEND_CONSTANT_DTOR, 1, 0); zend_hash_init_ex(&module_registry, 50, NULL, ZEND_MODULE_DTOR, 1, 0); @@ -701,7 +715,7 @@ int zend_startup(zend_utility_functions *utility_functions, char **extensions TS zend_interned_strings_init(TSRMLS_C); zend_startup_builtin_functions(TSRMLS_C); zend_register_standard_constants(TSRMLS_C); - zend_register_auto_global("GLOBALS", sizeof("GLOBALS") - 1, NULL TSRMLS_CC); + zend_register_auto_global("GLOBALS", sizeof("GLOBALS") - 1, 1, php_auto_globals_create_globals TSRMLS_CC); #ifndef ZTS zend_init_rsrc_plist(TSRMLS_C); diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index c70a8a589d..31f11ff1f9 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -163,27 +163,6 @@ static void build_runtime_defined_function_key(zval *result, const char *name, i /* }}} */ -int zend_auto_global_arm(zend_auto_global *auto_global TSRMLS_DC) /* {{{ */ -{ - auto_global->armed = (auto_global->auto_global_callback ? 1 : 0); - return 0; -} -/* }}} */ - - -ZEND_API int zend_auto_global_disable_jit(const char *varname, zend_uint varname_length TSRMLS_DC) /* {{{ */ -{ - zend_auto_global *auto_global; - - if (zend_hash_find(CG(auto_globals), varname, varname_length+1, (void **) &auto_global)==FAILURE) { - return FAILURE; - } - auto_global->armed = 0; - return SUCCESS; -} -/* }}} */ - - static void init_compiler_declarables(TSRMLS_D) /* {{{ */ { Z_TYPE(CG(declarables).ticks) = IS_LONG; @@ -211,7 +190,6 @@ void zend_init_compiler_data_structures(TSRMLS_D) /* {{{ */ CG(has_bracketed_namespaces) = 0; CG(current_import) = NULL; init_compiler_declarables(TSRMLS_C); - zend_hash_apply(CG(auto_globals), (apply_func_t) zend_auto_global_arm TSRMLS_CC); zend_stack_init(&CG(labels_stack)); CG(labels) = NULL; @@ -6069,12 +6047,6 @@ void zend_do_ticks(TSRMLS_D) /* {{{ */ } /* }}} */ -void zend_auto_global_dtor(zend_auto_global *auto_global) /* {{{ */ -{ - free(auto_global->name); -} -/* }}} */ - zend_bool zend_is_auto_global(const char *name, uint name_len TSRMLS_DC) /* {{{ */ { zend_auto_global *auto_global; @@ -6089,18 +6061,38 @@ zend_bool zend_is_auto_global(const char *name, uint name_len TSRMLS_DC) /* {{{ } /* }}} */ -int zend_register_auto_global(const char *name, uint name_len, zend_auto_global_callback auto_global_callback TSRMLS_DC) /* {{{ */ +int zend_register_auto_global(const char *name, uint name_len, zend_bool jit, zend_auto_global_callback auto_global_callback TSRMLS_DC) /* {{{ */ { zend_auto_global auto_global; - auto_global.name = zend_strndup(name, name_len); + auto_global.name = zend_new_interned_string(name, name_len + 1, 0); auto_global.name_len = name_len; auto_global.auto_global_callback = auto_global_callback; + auto_global.jit = jit; return zend_hash_add(CG(auto_globals), name, name_len+1, &auto_global, sizeof(zend_auto_global), NULL); } /* }}} */ +static int zend_auto_global_init(zend_auto_global *auto_global TSRMLS_DC) /* {{{ */ +{ + if (auto_global->jit) { + auto_global->armed = 1; + } else if (auto_global->auto_global_callback) { + auto_global->armed = auto_global->auto_global_callback(auto_global->name, auto_global->name_len TSRMLS_CC); + } else { + auto_global->armed = 0; + } + return 0; +} +/* }}} */ + +ZEND_API void zend_activate_auto_globals(TSRMLS_D) /* {{{ */ +{ + zend_hash_apply(CG(auto_globals), (apply_func_t) zend_auto_global_init TSRMLS_CC); +} +/* }}} */ + int zendlex(znode *zendlval TSRMLS_DC) /* {{{ */ { int retval; diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index d880eb7186..29588a18ca 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -651,13 +651,13 @@ typedef struct _zend_auto_global { char *name; uint name_len; zend_auto_global_callback auto_global_callback; + zend_bool jit; zend_bool armed; } zend_auto_global; -void zend_auto_global_dtor(zend_auto_global *auto_global); -ZEND_API int zend_register_auto_global(const char *name, uint name_len, zend_auto_global_callback auto_global_callback TSRMLS_DC); +ZEND_API int zend_register_auto_global(const char *name, uint name_len, zend_bool jit, zend_auto_global_callback auto_global_callback TSRMLS_DC); +ZEND_API void zend_activate_auto_globals(TSRMLS_D); ZEND_API zend_bool zend_is_auto_global(const char *name, uint name_len TSRMLS_DC); -ZEND_API int zend_auto_global_disable_jit(const char *varname, zend_uint varname_length TSRMLS_DC); ZEND_API size_t zend_dirname(char *path, size_t len); int zendlex(znode *zendlval TSRMLS_DC); diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index 18dc4dfd9a..3220dfea57 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -159,16 +159,6 @@ void init_executor(TSRMLS_D) /* {{{ */ zend_vm_stack_push((void *) NULL TSRMLS_CC); zend_hash_init(&EG(symbol_table), 50, NULL, ZVAL_PTR_DTOR, 0); - { - zval *globals; - - ALLOC_ZVAL(globals); - Z_SET_REFCOUNT_P(globals, 1); - Z_SET_ISREF_P(globals); - Z_TYPE_P(globals) = IS_ARRAY; - Z_ARRVAL_P(globals) = &EG(symbol_table); - zend_hash_update(&EG(symbol_table), "GLOBALS", sizeof("GLOBALS"), &globals, sizeof(zval *), NULL); - } EG(active_symbol_table) = &EG(symbol_table); zend_llist_apply(&zend_extensions, (llist_apply_func_t) zend_extension_activator TSRMLS_CC); diff --git a/ext/session/session.c b/ext/session/session.c index aa6e0e3a47..22428e342b 100644 --- a/ext/session/session.c +++ b/ext/session/session.c @@ -1993,7 +1993,7 @@ static PHP_GINIT_FUNCTION(ps) /* {{{ */ static PHP_MINIT_FUNCTION(session) /* {{{ */ { - zend_register_auto_global("_SESSION", sizeof("_SESSION")-1, NULL TSRMLS_CC); + zend_register_auto_global("_SESSION", sizeof("_SESSION")-1, 0, NULL TSRMLS_CC); PS(module_number) = module_number; /* if we really need this var we need to init it in zts mode as well! */ diff --git a/main/php_variables.c b/main/php_variables.c index a37349ac1d..e45598f603 100644 --- a/main/php_variables.c +++ b/main/php_variables.c @@ -643,98 +643,106 @@ static zend_bool php_auto_globals_create_request(char *name, uint name_len TSRML */ int php_hash_environment(TSRMLS_D) { - char *p; - unsigned char _gpc_flags[5] = {0, 0, 0, 0, 0}; - struct auto_global_record { - char *name; - uint name_len; - zend_bool jit_initialization; - } auto_global_records[] = { - { "_POST", sizeof("_POST"), 0 }, - { "_GET", sizeof("_GET"), 0 }, - { "_COOKIE", sizeof("_COOKIE"), 0 }, - { "_SERVER", sizeof("_SERVER"), 1 }, - { "_ENV", sizeof("_ENV"), 1 }, - { "_FILES", sizeof("_FILES"), 0 }, - }; - size_t num_track_vars = sizeof(auto_global_records)/sizeof(struct auto_global_record); - size_t i; - - /* jit_initialization = 0; */ - for (i=0; i