com php-src: update opcache for native-tls branch: ext/opcache/ZendAccelerator.c ext/opcache/ZendAccelerator.h ext/opcache/zend_accelerator_module.c

Commit: 26e0715c9f58b065fcd30b9ad163ac05f9652abf Author: krakjoe <joe.watkins@live.co.uk> Sat, 20 Sep 2014 21:33:40 +0100 Parents: b180fc2daa56cc0bfea3e1561fabdfdb452995b4 Branches: native-tls Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=26e0715c9f58b065fcd30b9ad163ac05f9652abf Log: update opcache for native-tls branch Changed paths: M ext/opcache/ZendAccelerator.c M ext/opcache/ZendAccelerator.h M ext/opcache/zend_accelerator_module.c Diff: diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c index e210a46..d9b3bea 100644 --- a/ext/opcache/ZendAccelerator..c +++ b/ext/opcache/ZendAccelerator.c @@ -89,7 +89,7 @@ ZEND_EXTENSION(); #ifndef ZTS zend_accel_globals accel_globals; #else -int accel_globals_id; +TSRMG_D(zend_accel_globals, accel_globals_id); #endif /* Points to the structure shared across all PHP processes */ @@ -2264,7 +2264,7 @@ static int accel_startup(zend_extension *extension) TSRMLS_FETCH(); #ifdef ZTS - accel_globals_id = ts_allocate_id(&accel_globals_id, sizeof(zend_accel_globals), (ts_allocate_ctor) accel_globals_ctor, (ts_allocate_dtor) accel_globals_dtor); + TSRMG_ALLOCATE(accel_globals_id, sizeof(zend_accel_globals), (ts_allocate_ctor) accel_globals_ctor, (ts_allocate_dtor) accel_globals_dtor); #else accel_globals_ctor(&accel_globals); #endif diff --git a/ext/opcache/ZendAccelerator.h b/ext/opcache/ZendAccelerator.h index c3c7285..c4bc8f8 100644 --- a/ext/opcache/ZendAccelerator.h +++ b/ext/opcache/ZendAccelerator.h @@ -282,7 +282,7 @@ extern zend_accel_shared_globals *accel_shared_globals; #ifdef ZTS # define ZCG(v) TSRMG(accel_globals_id, zend_accel_globals *, v) -extern int accel_globals_id; +TSRMG_DH(zend_accel_globals, accel_globals_id); #else # define ZCG(v) (accel_globals.v) extern zend_accel_globals accel_globals; diff --git a/ext/opcache/zend_accelerator_module.c b/ext/opcache/zend_accelerator_module.c index 001c3ee..6f9bbe5 100644 --- a/ext/opcache/zend_accelerator_module.c +++ b/ext/opcache/zend_accelerator_module.c @@ -449,7 +449,7 @@ static zend_module_entry accel_module_entry = { NULL, zend_accel_info, ACCELERATOR_VERSION "FE", - STANDARD_MODULE_PROPERTIES + STANDARD_MODULE_PROPERTIES_EX }; int start_accel_module(TSRMLS_D)