fix ticks init in ts build

weltling · weltling · commit fb6e718764fa · 2017-06-15T23:48:03.000+02:00
diff --git a/main/main.c b/main/main.c
@@ -1948,6 +1948,7 @@ static size_t php_output_wrapper(const char *str, size_t str_length)
 static void core_globals_ctor(php_core_globals *core_globals)
 {
 	memset(core_globals, 0, sizeof(*core_globals));
+	php_startup_ticks();
 }
 /* }}} */
 #endif
@@ -2106,7 +2107,6 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod
 
 #ifdef ZTS
 	ts_allocate_id(&core_globals_id, sizeof(php_core_globals), (ts_allocate_ctor) core_globals_ctor, (ts_allocate_dtor) core_globals_dtor);
-	php_startup_ticks();
 #ifdef PHP_WIN32
 	ts_allocate_id(&php_win32_core_globals_id, sizeof(php_win32_core_globals), (ts_allocate_ctor) php_win32_core_globals_ctor, (ts_allocate_dtor) php_win32_core_globals_dtor);
 #endif

Original file line number	Diff line number	Diff line change
`@@ -1948,6 +1948,7 @@ static size_t php_output_wrapper(const char *str, size_t str_length)`
`1948`	`1948`	`static void core_globals_ctor(php_core_globals *core_globals)`
`1949`	`1949`	`{`
`1950`	`1950`	`memset(core_globals, 0, sizeof(*core_globals));`
	`1951`	`+ php_startup_ticks();`
`1951`	`1952`	`}`
`1952`	`1953`	`/* }}} */`
`1953`	`1954`	`#endif`
`@@ -2106,7 +2107,6 @@ int php_module_startup(sapi_module_struct sf, zend_module_entry additional_mod`
`2106`	`2107`
`2107`	`2108`	`#ifdef ZTS`
`2108`	`2109`	`ts_allocate_id(&core_globals_id, sizeof(php_core_globals), (ts_allocate_ctor) core_globals_ctor, (ts_allocate_dtor) core_globals_dtor);`
`2109`		`- php_startup_ticks();`
`2110`	`2110`	`#ifdef PHP_WIN32`
`2111`	`2111`	`ts_allocate_id(&php_win32_core_globals_id, sizeof(php_win32_core_globals), (ts_allocate_ctor) php_win32_core_globals_ctor, (ts_allocate_dtor) php_win32_core_globals_dtor);`
`2112`	`2112`	`#endif`