diff options
| author | Anatol Belski <ab@php.net> | 2014-10-01 01:33:01 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-10-01 01:33:01 +0200 |
| commit | 9f9b3585b9cbe8574c5526d95e4701e05c4aff07 (patch) | |
| tree | 536d20e7bc5be139d2659f1f716958ba82ed11e5 /Zend/zend_alloc.c | |
| parent | 7d4f7c04b3057e41b617e33816119755e0a4fd73 (diff) | |
| download | php-git-9f9b3585b9cbe8574c5526d95e4701e05c4aff07.tar.gz | |
revert the local speedup approach
Diffstat (limited to 'Zend/zend_alloc.c')
| -rw-r--r-- | Zend/zend_alloc.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c index c0774d98b6..4d65e2d72d 100644 --- a/Zend/zend_alloc.c +++ b/Zend/zend_alloc.c @@ -2007,8 +2007,7 @@ typedef struct _zend_alloc_globals { #ifdef ZTS static int alloc_globals_id; -TSRMX_D(alloc); -# define AG(v) TSRMGX(TSRMX(alloc), alloc_globals_id, zend_alloc_globals *, v) +# define AG(v) TSRMG(alloc_globals_id, zend_alloc_globals *, v) #else # define AG(v) (alloc_globals.v) static zend_alloc_globals alloc_globals; @@ -2312,9 +2311,7 @@ static void alloc_globals_dtor(zend_alloc_globals *alloc_globals TSRMLS_DC) ZEND_API void start_memory_manager(TSRMLS_D) { #ifdef ZTS - ts_allocate_id - (&alloc_globals_id, sizeof(zend_alloc_globals), (ts_allocate_ctor) alloc_globals_ctor, (ts_allocate_dtor) alloc_globals_dtor); - TSRMX(alloc) = tsrm_get_ls_cache(); + ts_allocate_id(&alloc_globals_id, sizeof(zend_alloc_globals), (ts_allocate_ctor) alloc_globals_ctor, (ts_allocate_dtor) alloc_globals_dtor); #else alloc_globals_ctor(&alloc_globals); #endif |