From b3aebda9eaf55706af2e21178f229a171725a168 Mon Sep 17 00:00:00 2001 From: krakjoe Date: Sat, 20 Sep 2014 20:22:14 +0100 Subject: native tls initial patch --- ext/standard/basic_functions.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/standard/basic_functions.h') diff --git a/ext/standard/basic_functions.h b/ext/standard/basic_functions.h index 1b0325caa8..9490754b23 100644 --- a/ext/standard/basic_functions.h +++ b/ext/standard/basic_functions.h @@ -232,7 +232,7 @@ typedef struct _php_basic_globals { #ifdef ZTS #define BG(v) TSRMG(basic_globals_id, php_basic_globals *, v) -PHPAPI extern int basic_globals_id; +TSRMG_DH(php_basic_globals, basic_globals_id); #else #define BG(v) (basic_globals.v) PHPAPI extern php_basic_globals basic_globals; -- cgit v1.2.1 From d11734b4b00f57de80d931ad1c522e00082443af Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Thu, 25 Sep 2014 18:48:27 +0200 Subject: reworked the patch, less new stuff but worky TLS is already used in TSRM, the way exporting the tsrm cache through a thread local variable is not portable. Additionally, the current patch suffers from bugs which are hard to find, but prevent it to be worky with apache. What is done here is mainly uses the idea from the RFC patch, but - __thread variable is removed - offset math and declarations are removed - extra macros and definitions are removed What is done merely is - use an inline function to access the tsrm cache. The function uses the portable tsrm_tls_get macro which is cheap - all the TSRM_* macros are set to placebo. Thus this opens the way remove them later Except that, the logic is old. TSRMLS_FETCH will have to be done once per thread, then tsrm_get_ls_cache() can be used. Things seeming to be worky are cli, cli server and apache. I also tried to enable bz2 shared and it has worked out of the box. The change is yet minimal diffing to the current master bus is a worky start, IMHO. Though will have to recheck the other previously done SAPIs - embed and cgi. The offsets can be added to the tsrm_resource_type struct, then it'll not be needed to declare them in the userspace. Even the "done" member type can be changed to int16 or smaller, then adding the offset as int16 will not change the struct size. As well on the todo might be removing the hashed storage, thread_id != thread_id and linked list logic in favour of the explicit TLS operations. --- ext/standard/basic_functions.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/standard/basic_functions.h') diff --git a/ext/standard/basic_functions.h b/ext/standard/basic_functions.h index a6d8496d75..eaac7a1609 100644 --- a/ext/standard/basic_functions.h +++ b/ext/standard/basic_functions.h @@ -232,7 +232,7 @@ typedef struct _php_basic_globals { #ifdef ZTS #define BG(v) TSRMG(basic_globals_id, php_basic_globals *, v) -TSRMG_DH(php_basic_globals, basic_globals_id); +PHPAPI extern int basic_globals_id; #else #define BG(v) (basic_globals.v) PHPAPI extern php_basic_globals basic_globals; -- cgit v1.2.1 From b946348969c7d1fe5c666510d59151cdf7184586 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Sun, 5 Oct 2014 19:49:41 +0200 Subject: enable static tsrm ls cache in ext/standard --- ext/standard/basic_functions.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/standard/basic_functions.h') diff --git a/ext/standard/basic_functions.h b/ext/standard/basic_functions.h index eaac7a1609..1c142af842 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) -- cgit v1.2.1 From bdeb220f48825642f84cdbf3ff23a30613c92e86 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Sat, 13 Dec 2014 23:06:14 +0100 Subject: first shot remove TSRMLS_* things --- ext/standard/basic_functions.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'ext/standard/basic_functions.h') diff --git a/ext/standard/basic_functions.h b/ext/standard/basic_functions.h index c47ee0fb96..d6f926a90e 100644 --- a/ext/standard/basic_functions.h +++ b/ext/standard/basic_functions.h @@ -145,9 +145,9 @@ PHP_RSHUTDOWN_FUNCTION(user_filters); PHP_RSHUTDOWN_FUNCTION(browscap); /* Left for BC (not binary safe!) */ -PHPAPI int _php_error_log(int opt_err, char *message, char *opt, char *headers TSRMLS_DC); -PHPAPI int _php_error_log_ex(int opt_err, char *message, size_t message_len, char *opt, char *headers TSRMLS_DC); -PHPAPI int php_prefix_varname(zval *result, zval *prefix, char *var_name, size_t var_name_len, zend_bool add_underscore TSRMLS_DC); +PHPAPI int _php_error_log(int opt_err, char *message, char *opt, char *headers); +PHPAPI int _php_error_log_ex(int opt_err, char *message, size_t message_len, char *opt, char *headers); +PHPAPI int php_prefix_varname(zval *result, zval *prefix, char *var_name, size_t var_name_len, zend_bool add_underscore); #if SIZEOF_INT == 4 /* Most 32-bit and 64-bit systems have 32-bit ints */ @@ -259,12 +259,12 @@ typedef struct _php_shutdown_function_entry { int arg_count; } php_shutdown_function_entry; -PHPAPI extern zend_bool register_user_shutdown_function(char *function_name, size_t function_len, php_shutdown_function_entry *shutdown_function_entry TSRMLS_DC); -PHPAPI extern zend_bool remove_user_shutdown_function(char *function_name, size_t function_len TSRMLS_DC); -PHPAPI extern zend_bool append_user_shutdown_function(php_shutdown_function_entry shutdown_function_entry TSRMLS_DC); +PHPAPI extern zend_bool register_user_shutdown_function(char *function_name, size_t function_len, php_shutdown_function_entry *shutdown_function_entry); +PHPAPI extern zend_bool remove_user_shutdown_function(char *function_name, size_t function_len); +PHPAPI extern zend_bool append_user_shutdown_function(php_shutdown_function_entry shutdown_function_entry); -PHPAPI void php_call_shutdown_functions(TSRMLS_D); -PHPAPI void php_free_shutdown_functions(TSRMLS_D); +PHPAPI void php_call_shutdown_functions(void); +PHPAPI void php_free_shutdown_functions(void); #endif /* BASIC_FUNCTIONS_H */ -- cgit v1.2.1