diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2019-03-14 03:02:10 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2019-03-14 03:02:10 +0300 |
| commit | 2dd2dcaf9c8bcdda9c687660da887c5fddeb7448 (patch) | |
| tree | 0815453b216df50724b504f01825f3c4ca368f3e /Zend/zend_globals_macros.h | |
| parent | d349ea3ceb30b99657c0843f6ffc4ed7af619dd5 (diff) | |
| parent | 9499484ed2f0377678b2b4d88573327ee0e4ce6d (diff) | |
| download | php-git-2dd2dcaf9c8bcdda9c687660da887c5fddeb7448.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Implemented a faster way to access predefined TSRM resources - CG(), EG(), etc.
Diffstat (limited to 'Zend/zend_globals_macros.h')
| -rw-r--r-- | Zend/zend_globals_macros.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Zend/zend_globals_macros.h b/Zend/zend_globals_macros.h index 18181a433e..59b3daca53 100644 --- a/Zend/zend_globals_macros.h +++ b/Zend/zend_globals_macros.h @@ -29,7 +29,7 @@ BEGIN_EXTERN_C() /* Compiler */ #ifdef ZTS -# define CG(v) ZEND_TSRMG(compiler_globals_id, zend_compiler_globals *, v) +# define CG(v) ZEND_TSRMG_FAST(compiler_globals_offset, zend_compiler_globals *, v) #else # define CG(v) (compiler_globals.v) extern ZEND_API struct _zend_compiler_globals compiler_globals; @@ -39,7 +39,7 @@ ZEND_API int zendparse(void); /* Executor */ #ifdef ZTS -# define EG(v) ZEND_TSRMG(executor_globals_id, zend_executor_globals *, v) +# define EG(v) ZEND_TSRMG_FAST(executor_globals_offset, zend_executor_globals *, v) #else # define EG(v) (executor_globals.v) extern ZEND_API zend_executor_globals executor_globals; @@ -47,8 +47,9 @@ extern ZEND_API zend_executor_globals executor_globals; /* Language Scanner */ #ifdef ZTS -# define LANG_SCNG(v) ZEND_TSRMG(language_scanner_globals_id, zend_php_scanner_globals *, v) +# define LANG_SCNG(v) ZEND_TSRMG_FAST(language_scanner_globals_offset, zend_php_scanner_globals *, v) extern ZEND_API ts_rsrc_id language_scanner_globals_id; +extern ZEND_API size_t language_scanner_globals_offset; #else # define LANG_SCNG(v) (language_scanner_globals.v) extern ZEND_API zend_php_scanner_globals language_scanner_globals; @@ -57,8 +58,9 @@ extern ZEND_API zend_php_scanner_globals language_scanner_globals; /* INI Scanner */ #ifdef ZTS -# define INI_SCNG(v) ZEND_TSRMG(ini_scanner_globals_id, zend_ini_scanner_globals *, v) +# define INI_SCNG(v) ZEND_TSRMG_FAST(ini_scanner_globals_offset, zend_ini_scanner_globals *, v) extern ZEND_API ts_rsrc_id ini_scanner_globals_id; +extern ZEND_API size_t ini_scanner_globals_offset; #else # define INI_SCNG(v) (ini_scanner_globals.v) extern ZEND_API zend_ini_scanner_globals ini_scanner_globals; |