com php-src: move id initialization into ctor: ext/opcache/ZendAccelerator.c
| From: | Anatol Belski | Date: | Mon, 30 Jan 2017 10:40:23 +0000 |
| Subject: | com php-src: move id initialization into ctor: ext/opcache/ZendAccelerator.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-96906@lists.php.net to get a copy of this message | ||
Commit: 4b1afc829c0d2a3fec999dbe7c32377b5ee91803
Author: Anatol Belski <ab@php.net> Mon, 30 Jan 2017 11:40:23 +0100
Parents: 2b7e5468c9ace40fc96a3345d14af177cabcf613
Branches: PHP-7.0 PHP-7.1 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4b1afc829c0d2a3fec999dbe7c32377b5ee91803
Log:
move id initialization into ctor
Changed paths:
M ext/opcache/ZendAccelerator.c
Diff:
diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c
index 3baeeba..0db9202 100644
--- a/ext/opcache/ZendAccelerator.c
+++ b/ext/opcache/ZendAccelerator.c
@@ -2080,11 +2080,6 @@ static void accel_activate(void)
ZCG(cwd_key_len) = 0;
ZCG(cwd_check) = 1;
-#ifdef ZTS
- /* TODO refactor to init this just once. */
- accel_gen_system_id();
-#endif
-
#ifdef HAVE_OPCACHE_FILE_CACHE
if (ZCG(accel_directives).file_cache_only) {
return;
@@ -2548,6 +2543,9 @@ static void accel_globals_ctor(zend_accel_globals *accel_globals)
ZEND_TSRMLS_CACHE_UPDATE();
#endif
memset(accel_globals, 0, sizeof(zend_accel_globals));
+
+ /* TODO refactor to init this just once. */
+ accel_gen_system_id();
}
static void accel_globals_internal_func_dtor(zval *zv)