Skip to content

Commit af3ca74

Browse files
weltlingweltling
committed
made ZEND_TSRMLS_CACHE_* macros look like function calls
which also comply with the current semantics for such macros
1 parent 812c0c0 commit af3ca74

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+109
-109
lines changed

‎TSRM/TSRM.h

+6-6
Original file line numberDiff line numberDiff line change
@@ -168,9 +168,9 @@ TSRM_API void *tsrm_get_ls_cache(void);
168168
#define TSRMG(id, type, element) (((type) (*((void ***) tsrm_get_ls_cache()))[TSRM_UNSHUFFLE_RSRC_ID(id)])->element)
169169

170170
#define TSRMG_STATIC(id, type, element) (((type) (*((void ***) TSRMLS_CACHE))[TSRM_UNSHUFFLE_RSRC_ID(id)])->element)
171-
#define TSRMLS_CACHE_EXTERN extern TSRM_TLS void *TSRMLS_CACHE
172-
#define TSRMLS_CACHE_DEFINE TSRM_TLS void *TSRMLS_CACHE = NULL
173-
#define TSRMLS_CACHE_UPDATE if (!TSRMLS_CACHE) TSRMLS_CACHE = tsrm_get_ls_cache()
171+
#define TSRMLS_CACHE_EXTERN() extern TSRM_TLS void *TSRMLS_CACHE
172+
#define TSRMLS_CACHE_DEFINE() TSRM_TLS void *TSRMLS_CACHE = NULL
173+
#define TSRMLS_CACHE_UPDATE() if (!TSRMLS_CACHE) TSRMLS_CACHE = tsrm_get_ls_cache()
174174
#define TSRMLS_CACHE _tsrm_ls_cache
175175

176176
/* BC only */
@@ -191,9 +191,9 @@ TSRM_API void *tsrm_get_ls_cache(void);
191191
#define TSRMLS_SET_CTX(ctx)
192192

193193
#define TSRMG_STATIC(id, type, element)
194-
#define TSRMLS_CACHE_EXTERN
195-
#define TSRMLS_CACHE_DEFINE
196-
#define TSRMLS_CACHE_UPDATE
194+
#define TSRMLS_CACHE_EXTERN()
195+
#define TSRMLS_CACHE_DEFINE()
196+
#define TSRMLS_CACHE_UPDATE()
197197
#define TSRMLS_CACHE
198198

199199
/* BC only */

‎TSRM/tsrm_win32.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ static tsrm_win32_globals win32_globals;
4343
static void tsrm_win32_ctor(tsrm_win32_globals *globals)
4444
{
4545
#ifdef ZTS
46-
TSRMLS_CACHE_UPDATE;
46+
TSRMLS_CACHE_UPDATE();
4747
#endif
4848
globals->process = NULL;
4949
globals->shm = NULL;

‎TSRM/tsrm_win32.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ typedef struct {
7272

7373
#ifdef ZTS
7474
# define TWG(v) TSRMG_STATIC(win32_globals_id, tsrm_win32_globals *, v)
75-
TSRMLS_CACHE_EXTERN;
75+
TSRMLS_CACHE_EXTERN();
7676
#else
7777
# define TWG(v) (win32_globals.v)
7878
#endif

‎Zend/zend.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ static HashTable *global_class_table = NULL;
120120
static HashTable *global_constants_table = NULL;
121121
static HashTable *global_auto_globals_table = NULL;
122122
static HashTable *global_persistent_list = NULL;
123-
ZEND_TSRMLS_CACHE_DEFINE;
123+
ZEND_TSRMLS_CACHE_DEFINE();
124124
#endif
125125

126126
ZEND_API zend_utility_values zend_uv;
@@ -465,7 +465,7 @@ static void compiler_globals_dtor(zend_compiler_globals *compiler_globals) /* {{
465465

466466
static void executor_globals_ctor(zend_executor_globals *executor_globals) /* {{{ */
467467
{
468-
ZEND_TSRMLS_CACHE_UPDATE;
468+
ZEND_TSRMLS_CACHE_UPDATE();
469469
zend_startup_constants();
470470
zend_copy_constants(EG(zend_constants), GLOBAL_CONSTANTS_TABLE);
471471
zend_init_rsrc_plist();
@@ -564,7 +564,7 @@ int zend_startup(zend_utility_functions *utility_functions, char **extensions) /
564564
zend_executor_globals *executor_globals;
565565
extern ZEND_API ts_rsrc_id ini_scanner_globals_id;
566566
extern ZEND_API ts_rsrc_id language_scanner_globals_id;
567-
ZEND_TSRMLS_CACHE_UPDATE;
567+
ZEND_TSRMLS_CACHE_UPDATE();
568568
#else
569569
extern zend_ini_scanner_globals ini_scanner_globals;
570570
extern zend_php_scanner_globals language_scanner_globals;

‎Zend/zend.h

+7-7
Original file line numberDiff line numberDiff line change
@@ -62,19 +62,19 @@
6262

6363
#ifdef ZEND_ENABLE_STATIC_TSRMLS_CACHE
6464
#define ZEND_TSRMG TSRMG_STATIC
65-
#define ZEND_TSRMLS_CACHE_EXTERN TSRMLS_CACHE_EXTERN
66-
#define ZEND_TSRMLS_CACHE_DEFINE TSRMLS_CACHE_DEFINE
67-
#define ZEND_TSRMLS_CACHE_UPDATE TSRMLS_CACHE_UPDATE
65+
#define ZEND_TSRMLS_CACHE_EXTERN() TSRMLS_CACHE_EXTERN()
66+
#define ZEND_TSRMLS_CACHE_DEFINE() TSRMLS_CACHE_DEFINE()
67+
#define ZEND_TSRMLS_CACHE_UPDATE() TSRMLS_CACHE_UPDATE()
6868
#define ZEND_TSRMLS_CACHE TSRMLS_CACHE
6969
#else
7070
#define ZEND_TSRMG TSRMG
71-
#define ZEND_TSRMLS_CACHE_EXTERN
72-
#define ZEND_TSRMLS_CACHE_DEFINE
73-
#define ZEND_TSRMLS_CACHE_UPDATE
71+
#define ZEND_TSRMLS_CACHE_EXTERN()
72+
#define ZEND_TSRMLS_CACHE_DEFINE()
73+
#define ZEND_TSRMLS_CACHE_UPDATE()
7474
#define ZEND_TSRMLS_CACHE
7575
#endif
7676

77-
ZEND_TSRMLS_CACHE_EXTERN;
77+
ZEND_TSRMLS_CACHE_EXTERN();
7878

7979
#ifdef HAVE_NORETURN
8080
# ifdef ZEND_NORETRUN_ALIAS

‎Zend/zend_alloc.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -2388,7 +2388,7 @@ static void alloc_globals_ctor(zend_alloc_globals *alloc_globals)
23882388
return;
23892389
}
23902390
#endif
2391-
ZEND_TSRMLS_CACHE_UPDATE;
2391+
ZEND_TSRMLS_CACHE_UPDATE();
23922392
alloc_globals->mm_heap = zend_mm_init();
23932393
}
23942394

‎ext/bcmath/bcmath.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ zend_module_entry bcmath_module_entry = {
128128

129129
#ifdef COMPILE_DL_BCMATH
130130
#ifdef ZTS
131-
ZEND_TSRMLS_CACHE_DEFINE;
131+
ZEND_TSRMLS_CACHE_DEFINE();
132132
#endif
133133
ZEND_GET_MODULE(bcmath)
134134
#endif
@@ -144,7 +144,7 @@ PHP_INI_END()
144144
static PHP_GINIT_FUNCTION(bcmath)
145145
{
146146
#if defined(COMPILE_DL_BCMATH) && defined(ZTS)
147-
ZEND_TSRMLS_CACHE_UPDATE;
147+
ZEND_TSRMLS_CACHE_UPDATE();
148148
#endif
149149
bcmath_globals->bc_precision = 0;
150150
bc_init_numbers();

‎ext/bcmath/php_bcmath.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ ZEND_END_MODULE_GLOBALS(bcmath)
5151
#ifdef ZTS
5252
# define BCG(v) ZEND_TSRMG(bcmath_globals_id, zend_bcmath_globals *, v)
5353
# ifdef COMPILE_DL_BCMATH
54-
ZEND_TSRMLS_CACHE_EXTERN;
54+
ZEND_TSRMLS_CACHE_EXTERN();
5555
# endif
5656
#else
5757
# define BCG(v) (bcmath_globals.v)

‎ext/com_dotnet/com_extension.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ zend_module_entry com_dotnet_module_entry = {
255255

256256
#ifdef COMPILE_DL_COM_DOTNET
257257
#ifdef ZTS
258-
ZEND_TSRMLS_CACHE_DEFINE;
258+
ZEND_TSRMLS_CACHE_DEFINE();
259259
#endif
260260
ZEND_GET_MODULE(com_dotnet)
261261
#endif
@@ -341,7 +341,7 @@ PHP_INI_END()
341341
static PHP_GINIT_FUNCTION(com_dotnet)
342342
{
343343
#if defined(COMPILE_DL_COM_DOTNET) && defined(ZTS)
344-
ZEND_TSRMLS_CACHE_UPDATE;
344+
ZEND_TSRMLS_CACHE_UPDATE();
345345
#endif
346346
memset(com_dotnet_globals, 0, sizeof(*com_dotnet_globals));
347347
com_dotnet_globals->code_page = CP_ACP;

‎ext/com_dotnet/php_com_dotnet.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ ZEND_END_MODULE_GLOBALS(com_dotnet)
5555
#ifdef ZTS
5656
# define COMG(v) ZEND_TSRMG(com_dotnet_globals_id, zend_com_dotnet_globals *, v)
5757
# ifdef COMPILE_DL_COM_DOTNET
58-
ZEND_TSRMLS_CACHE_EXTERN;
58+
ZEND_TSRMLS_CACHE_EXTERN();
5959
# endif
6060
#else
6161
# define COMG(v) (com_dotnet_globals.v)

‎ext/exif/exif.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ ZEND_DECLARE_MODULE_GLOBALS(exif)
158158
#ifdef ZTS
159159
#define EXIF_G(v) ZEND_TSRMG(exif_globals_id, zend_exif_globals *, v)
160160
#ifdef COMPILE_DL_EXIF
161-
ZEND_TSRMLS_CACHE_DEFINE;
161+
ZEND_TSRMLS_CACHE_DEFINE();
162162
#endif
163163
#else
164164
#define EXIF_G(v) (exif_globals.v)
@@ -212,7 +212,7 @@ PHP_INI_END()
212212
static PHP_GINIT_FUNCTION(exif)
213213
{
214214
#if defined(COMPILE_DL_EXIF) && defined(ZTS)
215-
ZEND_TSRMLS_CACHE_UPDATE;
215+
ZEND_TSRMLS_CACHE_UPDATE();
216216
#endif
217217
exif_globals->encode_unicode = NULL;
218218
exif_globals->decode_unicode_be = NULL;

‎ext/filter/filter.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ zend_module_entry filter_module_entry = {
154154

155155
#ifdef COMPILE_DL_FILTER
156156
#ifdef ZTS
157-
ZEND_TSRMLS_CACHE_DEFINE;
157+
ZEND_TSRMLS_CACHE_DEFINE();
158158
#endif
159159
ZEND_GET_MODULE(filter)
160160
#endif
@@ -196,7 +196,7 @@ PHP_INI_END()
196196
static void php_filter_init_globals(zend_filter_globals *filter_globals) /* {{{ */
197197
{
198198
#if defined(COMPILE_DL_FILTER) && defined(ZTS)
199-
ZEND_TSRMLS_CACHE_UPDATE;
199+
ZEND_TSRMLS_CACHE_UPDATE();
200200
#endif
201201
ZVAL_UNDEF(&filter_globals->post_array);
202202
ZVAL_UNDEF(&filter_globals->get_array);

‎ext/filter/php_filter.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ ZEND_END_MODULE_GLOBALS(filter)
6565

6666
#ifdef ZTS
6767
#define IF_G(v) ZEND_TSRMG(filter_globals_id, zend_filter_globals *, v)
68-
ZEND_TSRMLS_CACHE_EXTERN;
68+
ZEND_TSRMLS_CACHE_EXTERN();
6969
#else
7070
#define IF_G(v) (filter_globals.v)
7171
#endif

‎ext/gmp/gmp.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ zend_module_entry gmp_module_entry = {
215215

216216
#ifdef COMPILE_DL_GMP
217217
#ifdef ZTS
218-
ZEND_TSRMLS_CACHE_DEFINE;
218+
ZEND_TSRMLS_CACHE_DEFINE();
219219
#endif
220220
ZEND_GET_MODULE(gmp)
221221
#endif
@@ -630,7 +630,7 @@ static int gmp_unserialize(zval *object, zend_class_entry *ce, const unsigned ch
630630
static ZEND_GINIT_FUNCTION(gmp)
631631
{
632632
#if defined(COMPILE_DL_GMP) && defined(ZTS)
633-
ZEND_TSRMLS_CACHE_UPDATE;
633+
ZEND_TSRMLS_CACHE_UPDATE();
634634
#endif
635635
gmp_globals->rand_initialized = 0;
636636
}

‎ext/gmp/php_gmp.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ ZEND_END_MODULE_GLOBALS(gmp)
9595
#ifdef ZTS
9696
#define GMPG(v) ZEND_TSRMG(gmp_globals_id, zend_gmp_globals *, v)
9797
#ifdef COMPILE_DL_GMP
98-
ZEND_TSRMLS_CACHE_EXTERN;
98+
ZEND_TSRMLS_CACHE_EXTERN();
9999
#endif
100100
#else
101101
#define GMPG(v) (gmp_globals.v)

‎ext/iconv/iconv.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ zend_module_entry iconv_module_entry = {
165165

166166
#ifdef COMPILE_DL_ICONV
167167
#ifdef ZTS
168-
ZEND_TSRMLS_CACHE_DEFINE;
168+
ZEND_TSRMLS_CACHE_DEFINE();
169169
#endif
170170
ZEND_GET_MODULE(iconv)
171171
#endif
@@ -174,7 +174,7 @@ ZEND_GET_MODULE(iconv)
174174
static PHP_GINIT_FUNCTION(iconv)
175175
{
176176
#if defined(COMPILE_DL_ICONV) && defined(ZTS)
177-
ZEND_TSRMLS_CACHE_UPDATE;
177+
ZEND_TSRMLS_CACHE_UPDATE();
178178
#endif
179179
iconv_globals->input_encoding = NULL;
180180
iconv_globals->output_encoding = NULL;

‎ext/iconv/php_iconv.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ ZEND_END_MODULE_GLOBALS(iconv)
7575
#ifdef ZTS
7676
# define ICONVG(v) ZEND_TSRMG(iconv_globals_id, zend_iconv_globals *, v)
7777
# ifdef COMPILE_DL_ICONV
78-
ZEND_TSRMLS_CACHE_EXTERN;
78+
ZEND_TSRMLS_CACHE_EXTERN();
7979
# endif
8080
#else
8181
# define ICONVG(v) (iconv_globals.v)

‎ext/interbase/php_ibase_includes.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ enum php_interbase_option {
134134
#ifdef ZTS
135135
# define IBG(v) ZEND_TSRMG(ibase_globals_id, zend_ibase_globals *, v)
136136
# ifdef COMPILE_DL_INTERBASE
137-
ZEND_TSRMLS_CACHE_EXTERN;
137+
ZEND_TSRMLS_CACHE_EXTERN();
138138
# endif
139139
#else
140140
#define IBG(v) (ibase_globals.v)

‎ext/intl/php_intl.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -895,7 +895,7 @@ zend_module_entry intl_module_entry = {
895895

896896
#ifdef COMPILE_DL_INTL
897897
#ifdef ZTS
898-
ZEND_TSRMLS_CACHE_DEFINE;
898+
ZEND_TSRMLS_CACHE_DEFINE();
899899
#endif
900900
ZEND_GET_MODULE( intl )
901901
#endif
@@ -904,7 +904,7 @@ ZEND_GET_MODULE( intl )
904904
static PHP_GINIT_FUNCTION(intl)
905905
{
906906
#if defined(COMPILE_DL_INTL) && defined(ZTS)
907-
ZEND_TSRMLS_CACHE_UPDATE;
907+
ZEND_TSRMLS_CACHE_UPDATE();
908908
#endif
909909
memset( intl_globals, 0, sizeof(zend_intl_globals) );
910910
}

‎ext/intl/php_intl.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ ZEND_END_MODULE_GLOBALS(intl)
5858
#ifdef ZTS
5959
#define INTL_G(v) ZEND_TSRMG(intl_globals_id, zend_intl_globals *, v)
6060
#ifdef COMPILE_DL_INTL
61-
ZEND_TSRMLS_CACHE_EXTERN;
61+
ZEND_TSRMLS_CACHE_EXTERN();
6262
#endif
6363
#else
6464
#define INTL_G(v) (intl_globals.v)

‎ext/json/json.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ static PHP_MINIT_FUNCTION(json)
134134
static PHP_GINIT_FUNCTION(json)
135135
{
136136
#if defined(COMPILE_DL_JSON) && defined(ZTS)
137-
ZEND_TSRMLS_CACHE_UPDATE;
137+
ZEND_TSRMLS_CACHE_UPDATE();
138138
#endif
139139
json_globals->encoder_depth = 0;
140140
json_globals->error_code = 0;
@@ -165,7 +165,7 @@ zend_module_entry json_module_entry = {
165165

166166
#ifdef COMPILE_DL_JSON
167167
#ifdef ZTS
168-
ZEND_TSRMLS_CACHE_DEFINE;
168+
ZEND_TSRMLS_CACHE_DEFINE();
169169
#endif
170170
ZEND_GET_MODULE(json)
171171
#endif

‎ext/libxml/libxml.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ static zend_class_entry *libxmlerror_class_entry;
8080
/* {{{ dynamically loadable module stuff */
8181
#ifdef COMPILE_DL_LIBXML
8282
#ifdef ZTS
83-
ZEND_TSRMLS_CACHE_DEFINE;
83+
ZEND_TSRMLS_CACHE_DEFINE();
8484
#endif
8585
ZEND_GET_MODULE(libxml)
8686
#endif /* COMPILE_DL_LIBXML */
@@ -272,7 +272,7 @@ static void php_libxml_node_free_list(xmlNodePtr node)
272272
static PHP_GINIT_FUNCTION(libxml)
273273
{
274274
#if defined(COMPILE_DL_LIBXML) && defined(ZTS)
275-
ZEND_TSRMLS_CACHE_UPDATE;
275+
ZEND_TSRMLS_CACHE_UPDATE();
276276
#endif
277277
ZVAL_UNDEF(&libxml_globals->stream_context);
278278
libxml_globals->error_buffer.s = NULL;

‎ext/libxml/php_libxml.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ PHP_LIBXML_API void php_libxml_shutdown(void);
115115
#ifdef ZTS
116116
#define LIBXML(v) ZEND_TSRMG(libxml_globals_id, zend_libxml_globals *, v)
117117
#ifdef COMPILE_DL_LIBXML
118-
ZEND_TSRMLS_CACHE_EXTERN;
118+
ZEND_TSRMLS_CACHE_EXTERN();
119119
#endif
120120
#else
121121
#define LIBXML(v) (libxml_globals.v)

‎ext/mbstring/mbstring.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -598,7 +598,7 @@ static sapi_post_entry php_post_entries[] = {
598598

599599
#ifdef COMPILE_DL_MBSTRING
600600
#ifdef ZTS
601-
ZEND_TSRMLS_CACHE_DEFINE;
601+
ZEND_TSRMLS_CACHE_DEFINE();
602602
#endif
603603
ZEND_GET_MODULE(mbstring)
604604
#endif
@@ -1495,7 +1495,7 @@ PHP_INI_END()
14951495
static PHP_GINIT_FUNCTION(mbstring)
14961496
{
14971497
#if defined(COMPILE_DL_MBSTRING) && defined(ZTS)
1498-
ZEND_TSRMLS_CACHE_UPDATE;
1498+
ZEND_TSRMLS_CACHE_UPDATE();
14991499
#endif
15001500

15011501
mbstring_globals->language = mbfl_no_language_uni;

‎ext/mbstring/mbstring.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ struct mb_overload_def {
201201

202202
#ifdef ZTS
203203
#define MBSTRG(v) ZEND_TSRMG(mbstring_globals_id, zend_mbstring_globals *, v)
204-
ZEND_TSRMLS_CACHE_EXTERN;
204+
ZEND_TSRMLS_CACHE_EXTERN();
205205
#else
206206
#define MBSTRG(v) (mbstring_globals.v)
207207
#endif

‎ext/mysql/php_mysql.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@ zend_module_entry mysql_module_entry = {
353353

354354
#ifdef COMPILE_DL_MYSQL
355355
#ifdef ZTS
356-
ZEND_TSRMLS_CACHE_DEFINE;
356+
ZEND_TSRMLS_CACHE_DEFINE();
357357
#endif
358358
ZEND_GET_MODULE(mysql)
359359
#endif
@@ -516,7 +516,7 @@ PHP_INI_END()
516516
static PHP_GINIT_FUNCTION(mysql)
517517
{
518518
#if defined(COMPILE_DL_MYSQL) && defined(ZTS)
519-
ZEND_TSRMLS_CACHE_UPDATE;
519+
ZEND_TSRMLS_CACHE_UPDATE();
520520
#endif
521521
mysql_globals->num_persistent = 0;
522522
mysql_globals->default_socket = NULL;

‎ext/mysql/php_mysql_structs.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ ZEND_END_MODULE_GLOBALS(mysql)
129129
#ifdef ZTS
130130
# define MySG(v) ZEND_TSRMG(mysql_globals_id, zend_mysql_globals *, v)
131131
# ifdef COMPILE_DL_MYSQL
132-
ZEND_TSRMLS_CACHE_EXTERN;
132+
ZEND_TSRMLS_CACHE_EXTERN();
133133
# endif
134134
#else
135135
# define MySG(v) (mysql_globals.v)

0 commit comments

Comments
 (0)