From 4db75dc8533a69e8849651ab5d0fa84efa3d8bba Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Mon, 22 Sep 2014 20:58:45 +0200 Subject: basic windows fix --- win32/php_win32_globals.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'win32/php_win32_globals.h') diff --git a/win32/php_win32_globals.h b/win32/php_win32_globals.h index 42f5ec9411..ae975dcb31 100644 --- a/win32/php_win32_globals.h +++ b/win32/php_win32_globals.h @@ -27,7 +27,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) -extern PHPAPI int php_win32_core_globals_id; +TSRMG_DH(php_win32_core_globals, php_win32_core_globals_id); #else # define PW32G(v) (the_php_win32_core_globals.v) extern PHPAPI struct _php_win32_core_globals the_php_win32_core_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. --- win32/php_win32_globals.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'win32/php_win32_globals.h') diff --git a/win32/php_win32_globals.h b/win32/php_win32_globals.h index ae975dcb31..42f5ec9411 100644 --- a/win32/php_win32_globals.h +++ b/win32/php_win32_globals.h @@ -27,7 +27,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) -TSRMG_DH(php_win32_core_globals, php_win32_core_globals_id); +extern PHPAPI int php_win32_core_globals_id; #else # define PW32G(v) (the_php_win32_core_globals.v) extern PHPAPI struct _php_win32_core_globals the_php_win32_core_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 --- win32/php_win32_globals.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'win32/php_win32_globals.h') diff --git a/win32/php_win32_globals.h b/win32/php_win32_globals.h index 42f5ec9411..4029117b8f 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) -- 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 --- win32/php_win32_globals.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'win32/php_win32_globals.h') diff --git a/win32/php_win32_globals.h b/win32/php_win32_globals.h index 4029117b8f..4341a99959 100644 --- a/win32/php_win32_globals.h +++ b/win32/php_win32_globals.h @@ -43,8 +43,8 @@ struct _php_win32_core_globals { HashTable *registry_directories; }; -void php_win32_core_globals_ctor(void *vg TSRMLS_DC); -void php_win32_core_globals_dtor(void *vg TSRMLS_DC); +void php_win32_core_globals_ctor(void *vg); +void php_win32_core_globals_dtor(void *vg); PHP_RSHUTDOWN_FUNCTION(win32_core_globals); #endif -- cgit v1.2.1