diff options
| author | Anatol Belski <ab@php.net> | 2014-10-01 22:04:21 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-10-01 22:04:21 +0200 |
| commit | 76081df168829a5cc0409fac47c217d4927ec6f6 (patch) | |
| tree | 9d17ebf69a2c193ca318619aae24e821d9ef5634 /Zend/zend_alloc.c | |
| parent | c161b95cdfbd45bd90c0327d29e1c967a4152c28 (diff) | |
| download | php-git-76081df168829a5cc0409fac47c217d4927ec6f6.tar.gz | |
using pointer to the tsrm ls cache instead of a function call
yet another approach
Diffstat (limited to 'Zend/zend_alloc.c')
| -rw-r--r-- | Zend/zend_alloc.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c index 4d65e2d72d..a78c8b2fe3 100644 --- a/Zend/zend_alloc.c +++ b/Zend/zend_alloc.c @@ -2007,7 +2007,7 @@ typedef struct _zend_alloc_globals { #ifdef ZTS static int alloc_globals_id; -# define AG(v) TSRMG(alloc_globals_id, zend_alloc_globals *, v) +# define AG(v) ZEND_TSRMG(alloc_globals_id, zend_alloc_globals *, v) #else # define AG(v) (alloc_globals.v) static zend_alloc_globals alloc_globals; @@ -2285,6 +2285,7 @@ ZEND_API void shutdown_memory_manager(int silent, int full_shutdown TSRMLS_DC) static void alloc_globals_ctor(zend_alloc_globals *alloc_globals TSRMLS_DC) { + #if ZEND_MM_CUSTOM char *tmp = getenv("USE_ZEND_ALLOC"); @@ -2298,6 +2299,7 @@ static void alloc_globals_ctor(zend_alloc_globals *alloc_globals TSRMLS_DC) return; } #endif + ZEND_TSRMLS_CACHE_UPDATE; alloc_globals->mm_heap = zend_mm_init(); } |