diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2019-03-12 17:35:50 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2019-03-12 17:35:50 +0300 |
| commit | 04b67bac32e5fbc0942a1e15405fa1ca7f0438fe (patch) | |
| tree | 2c302e1a5f3389a813955f2cecd75e1b635e485a /Zend | |
| parent | 7139c381f133eff38e1fcebfa29f35119c8648f4 (diff) | |
| download | php-git-04b67bac32e5fbc0942a1e15405fa1ca7f0438fe.tar.gz | |
Avoid reinitailization of ZTS cache pointer. Initialize it once in TSRM.c
Diffstat (limited to 'Zend')
| -rw-r--r-- | Zend/zend.c | 3 | ||||
| -rw-r--r-- | Zend/zend_alloc.c | 1 | ||||
| -rw-r--r-- | Zend/zend_signal.c | 1 |
3 files changed, 0 insertions, 5 deletions
diff --git a/Zend/zend.c b/Zend/zend.c index 7361efcb0e..542ac9ff1d 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -679,8 +679,6 @@ static void compiler_globals_dtor(zend_compiler_globals *compiler_globals) /* {{ static void executor_globals_ctor(zend_executor_globals *executor_globals) /* {{{ */ { - ZEND_TSRMLS_CACHE_UPDATE(); - zend_startup_constants(); zend_copy_constants(executor_globals->zend_constants, GLOBAL_CONSTANTS_TABLE); zend_init_rsrc_plist(); @@ -780,7 +778,6 @@ int zend_startup(zend_utility_functions *utility_functions) /* {{{ */ zend_executor_globals *executor_globals; extern ZEND_API ts_rsrc_id ini_scanner_globals_id; extern ZEND_API ts_rsrc_id language_scanner_globals_id; - ZEND_TSRMLS_CACHE_UPDATE(); #else extern zend_ini_scanner_globals ini_scanner_globals; extern zend_php_scanner_globals language_scanner_globals; diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c index 83eee90312..27879dae03 100644 --- a/Zend/zend_alloc.c +++ b/Zend/zend_alloc.c @@ -2723,7 +2723,6 @@ static void alloc_globals_ctor(zend_alloc_globals *alloc_globals) if (tmp && zend_atoi(tmp, 0)) { zend_mm_use_huge_pages = 1; } - ZEND_TSRMLS_CACHE_UPDATE(); alloc_globals->mm_heap = zend_mm_init(); } diff --git a/Zend/zend_signal.c b/Zend/zend_signal.c index d5146b6dec..a0dccd5819 100644 --- a/Zend/zend_signal.c +++ b/Zend/zend_signal.c @@ -87,7 +87,6 @@ void zend_signal_handler_defer(int signo, siginfo_t *siginfo, void *context) zend_bool is_handling_safe = 1; #ifdef ZTS - ZEND_TSRMLS_CACHE_UPDATE(); /* A signal could hit after TSRM shutdown, in this case globals are already freed. */ if (NULL == TSRMLS_CACHE || NULL == TSRMG_BULK_STATIC(zend_signal_globals_id, zend_signal_globals_t *)) { is_handling_safe = 0; |