com php-src: revert the local speedup approach: TSRM/TSRM.h Zend/zend_alloc.c Zend/zend_ini.c

Commit: 9f9b3585b9cbe8574c5526d95e4701e05c4aff07 Author: Anatol Belski <ab@php.net> Wed, 1 Oct 2014 01:33:01 +0200 Parents: 7d4f7c04b3057e41b617e33816119755e0a4fd73 Branches: native-tls Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9f9b3585b9cbe8574c5526d95e4701e05c4aff07 Log: revert the local speedup approach Changed paths: M TSRM/TSRM.h M Zend/zend_alloc.c M Zend/zend_ini.c Diff: diff --git a/TSRM/TSRM.h b/TSRM/TSRM.h index 8290216...41cd948 100644 --- a/TSRM/TSRM.h +++ b/TSRM/TSRM.h @@ -160,13 +160,10 @@ TSRM_API inline void *tsrm_get_ls_cache(void); #define TSRM_SHUFFLE_RSRC_ID(rsrc_id) ((rsrc_id)+1) #define TSRM_UNSHUFFLE_RSRC_ID(rsrc_id) ((rsrc_id)-1) -#define TSRMLS_FETCH() void ***tsrm_ls = (void ***) ts_resource_ex(0, NULL) -#define TSRMLS_FETCH_FROM_CTX(ctx) void ***tsrm_ls = (void ***) ctx -#define TSRMLS_SET_CTX(ctx) ctx = (void ***) tsrm_get_ls_cache() -#define TSRMX(name) tsrm_ls_cache_##name -#define TSRMX_D(name) static void*** TSRMX(name) -#define TSRMGX(cache, id, type, element) (((type) (*((void ***) cache))[TSRM_UNSHUFFLE_RSRC_ID(id)])->element) -#define TSRMG(id, type, element) TSRMGX(tsrm_get_ls_cache(), id, type, element) +#define TSRMLS_FETCH() void ***tsrm_ls = (void ***) ts_resource_ex(0, NULL) +#define TSRMLS_FETCH_FROM_CTX(ctx) void ***tsrm_ls = (void ***) ctx +#define TSRMLS_SET_CTX(ctx) ctx = (void ***) tsrm_get_ls_cache() +#define TSRMG(id, type, element) (((type) (*((void ***) tsrm_get_ls_cache()))[TSRM_UNSHUFFLE_RSRC_ID(id)])->element) #define TSRMLS_D #define TSRMLS_DC #define TSRMLS_C diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c index c0774d9..4d65e2d 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 diff --git a/Zend/zend_ini.c b/Zend/zend_ini.c index 25155c4..1c827bb 100644 --- a/Zend/zend_ini.c +++ b/Zend/zend_ini.c @@ -169,7 +169,6 @@ ZEND_API int zend_copy_ini_directives(TSRMLS_D) /* {{{ */ EG(ini_directives) = (HashTable *) malloc(sizeof(HashTable)); zend_hash_init_ex(EG(ini_directives), registered_zend_ini_directives->nNumOfElements, NULL, free_ini_entry, 1, 0); zend_hash_copy(EG(ini_directives), registered_zend_ini_directives, copy_ini_entry); - return SUCCESS; } /* }}} */