com php-src: enable static tsrm ls cache in ext/standard: ext/standard/assert.c ext/standard/basic_functions.h ext/ standard/browscap.c
ext/standard/config.m4 ext/standa rd/config.w32 ext/standard/dir.c ext/standard/file .h ext/standard/php_array.h ext/standard/php_lcg. h
win32/php_win32_globals.h

Commit: b946348969c7d1fe5c666510d59151cdf7184586 Author: Anatol Belski <ab@php.net> Sun, 5 Oct 2014 19:49:41 +0200 Parents: a91d3580a7c9461729608c4b7e2c193cdf4206ce Branches: native-tls Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b946348969c7d1fe5c666510d59151cdf7184586 Log: enable static tsrm ls cache in ext/standard Changed paths: M ext/standard/assert.c M ext/standard/basic_functions.h M ext/standard/browscap.c M ext/standard/config.m4 M ext/standard/config.w32 M ext/standard/dir.c M ext/standard/file.h M ext/standard/php_array.h M ext/standard/php_lcg.h M win32/php_win32_globals.h Diff: diff --git a/ext/standard/assert.c b/ext/standard/assert.c index 6547217..efb708d 100644 --- a/ext/standard/assert.c +++ b/ext/standard/assert.c @@ -36,7 +36,7 @@ ZEND_END_MODULE_GLOBALS(assert) ZEND_DECLARE_MODULE_GLOBALS(assert) #ifdef ZTS -#define ASSERTG(v) TSRMG(assert_globals_id, zend_assert_globals *, v) +#define ASSERTG(v) ZEND_TSRMG(assert_globals_id, zend_assert_globals *, v) #else #define ASSERTG(v) (assert_globals.v) #endif diff --git a/ext/standard/basic_functions.h b/ext/standard/basic_functions.h index eaac7a1..1c142af 100644 --- a/ext/standard/basic_functions.h +++ b/ext/standard/basic_functions.h @@ -231,7 +231,7 @@ typedef struct _php_basic_globals { } php_basic_globals; #ifdef ZTS -#define BG(v) TSRMG(basic_globals_id, php_basic_globals *, v) +#define BG(v) ZEND_TSRMG(basic_globals_id, php_basic_globals *, v) PHPAPI extern int basic_globals_id; #else #define BG(v) (basic_globals.v) diff --git a/ext/standard/browscap.c b/ext/standard/browscap.c index a76fb13..2ea837f 100644 --- a/ext/standard/browscap.c +++ b/ext/standard/browscap.c @@ -46,7 +46,7 @@ ZEND_END_MODULE_GLOBALS(browscap) ZEND_DECLARE_MODULE_GLOBALS(browscap) #ifdef ZTS -#define BROWSCAP_G(v) TSRMG(browscap_globals_id, zend_browscap_globals *, v) +#define BROWSCAP_G(v) ZEND_TSRMG(browscap_globals_id, zend_browscap_globals *, v) #else #define BROWSCAP_G(v) (browscap_globals.v) #endif diff --git a/ext/standard/config.m4 b/ext/standard/config.m4 index 7a5f0ef..e2ce61f 100644 --- a/ext/standard/config.m4 +++ b/ext/standard/config.m4 @@ -605,7 +605,8 @@ PHP_NEW_EXTENSION(standard, array.c base64.c basic_functions.c browscap.c crc32. incomplete_class.c url_scanner_ex.c ftp_fopen_wrapper.c \ http_fopen_wrapper.c php_fopen_wrapper.c credits.c css.c \ var_unserializer.c ftok.c sha1.c user_filters.c uuencode.c \ - filters.c proc_open.c streamsfuncs.c http.c password.c) + filters.c proc_open.c streamsfuncs.c http.c password.c,,, + -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) PHP_ADD_MAKEFILE_FRAGMENT PHP_INSTALL_HEADERS([ext/standard/]) diff --git a/ext/standard/config.w32 b/ext/standard/config.w32 index 5f24641b..e8b50ef 100644 --- a/ext/standard/config.w32 +++ b/ext/standard/config.w32 @@ -20,7 +20,8 @@ EXTENSION("standard", "array.c base64.c basic_functions.c browscap.c \ url_scanner_ex.c ftp_fopen_wrapper.c http_fopen_wrapper.c \ php_fopen_wrapper.c credits.c css.c var_unserializer.c ftok.c sha1.c \ user_filters.c uuencode.c filters.c proc_open.c password.c \ - streamsfuncs..c http.c flock_compat.c", false /* never shared */); + streamsfuncs.c http.c flock_compat.c", false /* never shared */, + '/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1'); PHP_INSTALL_HEADERS("", "ext/standard"); if (PHP_MBREGEX != "no") { CHECK_HEADER_ADD_INCLUDE("oniguruma.h", "CFLAGS_STANDARD", PHP_MBREGEX + ";ext\\mbstring\\oniguruma") diff --git a/ext/standard/dir.c b/ext/standard/dir.c index 7b4ab1c..6f4c70e 100644 --- a/ext/standard/dir.c +++ b/ext/standard/dir.c @@ -56,7 +56,7 @@ typedef struct { } php_dir_globals; #ifdef ZTS -#define DIRG(v) TSRMG(dir_globals_id, php_dir_globals *, v) +#define DIRG(v) ZEND_TSRMG(dir_globals_id, php_dir_globals *, v) int dir_globals_id; #else #define DIRG(v) (dir_globals.v) diff --git a/ext/standard/file.h b/ext/standard/file.h index fdace75..e7de88f 100644 --- a/ext/standard/file.h +++ b/ext/standard/file.h @@ -130,7 +130,7 @@ typedef struct { } php_file_globals; #ifdef ZTS -#define FG(v) TSRMG(file_globals_id, php_file_globals *, v) +#define FG(v) ZEND_TSRMG(file_globals_id, php_file_globals *, v) extern PHPAPI int file_globals_id; #else #define FG(v) (file_globals.v) diff --git a/ext/standard/php_array.h b/ext/standard/php_array.h index d86121b..2c9b164 100644 --- a/ext/standard/php_array.h +++ b/ext/standard/php_array.h @@ -130,7 +130,7 @@ ZEND_BEGIN_MODULE_GLOBALS(array) ZEND_END_MODULE_GLOBALS(array) #ifdef ZTS -#define ARRAYG(v) TSRMG(array_globals_id, zend_array_globals *, v) +#define ARRAYG(v) ZEND_TSRMG(array_globals_id, zend_array_globals *, v) #else #define ARRAYG(v) (array_globals.v) #endif diff --git a/ext/standard/php_lcg.h b/ext/standard/php_lcg.h index dcc82e9..81d251c 100644 --- a/ext/standard/php_lcg.h +++ b/ext/standard/php_lcg.h @@ -35,7 +35,7 @@ PHP_FUNCTION(lcg_value); PHP_MINIT_FUNCTION(lcg); #ifdef ZTS -#define LCG(v) TSRMG(lcg_globals_id, php_lcg_globals *, v) +#define LCG(v) ZEND_TSRMG(lcg_globals_id, php_lcg_globals *, v) #else #define LCG(v) (lcg_globals.v) #endif diff --git a/win32/php_win32_globals.h b/win32/php_win32_globals.h index 42f5ec9..4029117 100644 --- a/win32/php_win32_globals.h +++ b/win32/php_win32_globals.h @@ -26,7 +26,7 @@ typedef struct _php_win32_core_globals php_win32_core_globals; #ifdef ZTS -# define PW32G(v) TSRMG(php_win32_core_globals_id, php_win32_core_globals*, v) +# define PW32G(v) ZEND_TSRMG(php_win32_core_globals_id, php_win32_core_globals*, v) extern PHPAPI int php_win32_core_globals_id; #else # define PW32G(v) (the_php_win32_core_globals.v)