Optimization INIT

yulonghu · Mar 30, 2019 · 2fed643 · 2fed643
1 parent 7f63c9e
commit 2fed643
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 15 deletions.
diff --git a/asf/asf.c b/asf/asf.c
@@ -144,10 +144,6 @@ PHP_MSHUTDOWN_FUNCTION(asf)
 */
 PHP_RINIT_FUNCTION(asf)
 {
-#if defined(COMPILE_DL_ASF) && defined(ZTS)
-    ZEND_TSRMLS_CACHE_UPDATE();
-#endif
-
     /* globals var */
     ASF_G(default_module)   = zend_string_init(ASF_API_NAME, ASF_API_LEN, 0);
     ASF_G(default_service)  = zend_string_init("index", sizeof("index") - 1, 0);
@@ -261,7 +257,6 @@ PHP_MINFO_FUNCTION(asf)
     php_info_print_table_row(2, "Build Date", __DATE__ " " __TIME__);
     php_info_print_table_end();
 
-    /* Remove comments if you have entries in php.ini */
     DISPLAY_INI_ENTRIES();
 }
 /* }}} */
@@ -294,9 +289,6 @@ zend_module_entry asf_module_entry = {
 /* }}} */
 
 #ifdef COMPILE_DL_ASF
-#ifdef ZTS
-ZEND_TSRMLS_CACHE_DEFINE()
-#endif
 ZEND_GET_MODULE(asf)
 #endif
 

diff --git a/asf/asf_sg.c b/asf/asf_sg.c
@@ -145,8 +145,6 @@ static int asf_sg_strtok_del(HashTable *ht, zend_string *key) /* {{{ */
 	return zend_symtable_del(ht, key);
 }/*}}}*/
 
-
-
 void asf_sg_instance() /* {{{ */
 {
     zval regs;

diff --git a/asf/config.m4 b/asf/config.m4
@@ -89,5 +89,5 @@ if test "$PHP_ASF" != "no"; then
       cache/asf_cache_abstractadapter.c \
       cache/adapter/asf_cache_adapter_redis.c \
       cache/adapter/asf_cache_adapter_memcached.c \
-      , $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
+      , $ext_shared)
 fi
diff --git a/asf/php_asf.h b/asf/php_asf.h
@@ -137,10 +137,6 @@ ZEND_END_MODULE_GLOBALS(asf)
 
 extern ZEND_DECLARE_MODULE_GLOBALS(asf);
 
-#if defined(ZTS) && defined(COMPILE_DL_ASF)
-ZEND_TSRMLS_CACHE_EXTERN()
-#endif
-
 #endif	/* PHP_ASF_H */
 
 /*