diff options
| author | Zeev Suraski <zeev@php.net> | 2001-07-28 11:36:37 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2001-07-28 11:36:37 +0000 |
| commit | d87cc976e1156b839fc6d4aa6b473a126802b8e3 (patch) | |
| tree | 8acb068dd7458e1c8df3a7d8ecb87d065990fdb1 /ext/hyperwave | |
| parent | b4f3b9d3ce9f55cf040fb5aa8f201c64646cab43 (diff) | |
| download | php-git-d87cc976e1156b839fc6d4aa6b473a126802b8e3.tar.gz | |
Redesigned thread safety mechanism - nua nua
Diffstat (limited to 'ext/hyperwave')
| -rw-r--r-- | ext/hyperwave/hw.c | 11 | ||||
| -rw-r--r-- | ext/hyperwave/php_hyperwave.h | 12 |
2 files changed, 7 insertions, 16 deletions
diff --git a/ext/hyperwave/hw.c b/ext/hyperwave/hw.c index a8b12ac5ca..42e30a7ea7 100644 --- a/ext/hyperwave/hw.c +++ b/ext/hyperwave/hw.c @@ -151,7 +151,7 @@ void print_msg(hg_msg *msg, char *str, int txt); void _close_hw_link(zend_rsrc_list_entry *rsrc) { hw_connection *conn = (hw_connection *)rsrc->ptr; - HwSLS_FETCH(); + TSRMLS_FETCH(); if(conn->hostname) free(conn->hostname); @@ -165,7 +165,7 @@ void _close_hw_link(zend_rsrc_list_entry *rsrc) void _close_hw_plink(zend_rsrc_list_entry *rsrc) { hw_connection *conn = (hw_connection *)rsrc->ptr; - HwSLS_FETCH(); + TSRMLS_FETCH(); if(conn->hostname) free(conn->hostname); @@ -194,8 +194,10 @@ static void php_hw_init_globals(zend_hw_globals *hw_globals) hw_globals->num_persistent = 0; } -static PHP_INI_MH(OnHyperwavePort) { - HwSLS_FETCH(); +static PHP_INI_MH(OnHyperwavePort) +{ + TSRMLS_FETCH(); + if (new_value==NULL) { HwSG(default_port) = HG_SERVER_PORT; } else { @@ -711,7 +713,6 @@ static void php_hw_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) hw_connection *ptr; int do_swap; int version = 0; - HwSLS_FETCH(); argc = ZEND_NUM_ARGS(); switch(argc) { diff --git a/ext/hyperwave/php_hyperwave.h b/ext/hyperwave/php_hyperwave.h index 7fe434df81..1ae69f4b55 100644 --- a/ext/hyperwave/php_hyperwave.h +++ b/ext/hyperwave/php_hyperwave.h @@ -50,19 +50,9 @@ typedef struct { } zend_hw_globals; #ifdef ZTS -# define HwSLS_D zend_hw_globals *hw_globals -# define HwSLS_DC , HwSLS_D -# define HwSLS_C hw_globals -# define HwSLS_CC , HwSLS_C -# define HwSG(v) (hw_globals->v) -# define HwSLS_FETCH() zend_hw_globals *hw_globals = ts_resource(hw_globals_id) +# define HwSG(v) TSRMG(hw_globals_id, zend_hw_globals *, v) #else -# define HwSLS_D -# define HwSLS_DC -# define HwSLS_C -# define HwSLS_CC # define HwSG(v) (hw_globals.v) -# define HwSLS_FETCH() extern PHP_HW_API zend_hw_globals hw_globals; #endif |