mirrors/phpv8
mirrors/phpv8
0
0
Fork 0
mirror of https://github.com/phpv8/v8js.git synced 2025-01-03 11:21:51 +00:00
Code Releases Activity

Merge pull request #69 from stesie/fix-global-zts-init

Browse Source 
Initialize v8js_globals manually only if ZTS is enabled.
This commit is contained in:
Patrick Reilly 2013-10-26 18:21:25 -07:00
commit ae2ad9967d
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
v8js.cc
View File

@ -1539,11 +1539,6 @@ static PHP_MINIT_FUNCTION(v8js)
{ {
zend_class_entry ce; zend_class_entry ce;
#ifdef ZTS
std::mutex mutex;
memcpy(&V8JSG(timer_mutex), &mutex, sizeof(V8JSG(timer_mutex)));
#endif
/* V8Object Class */ /* V8Object Class */
INIT_CLASS_ENTRY(ce, "V8Object", NULL); INIT_CLASS_ENTRY(ce, "V8Object", NULL);
php_ce_v8_object = zend_register_internal_class(&ce TSRMLS_CC); php_ce_v8_object = zend_register_internal_class(&ce TSRMLS_CC);
@ -1675,6 +1670,7 @@ static PHP_MINFO_FUNCTION(v8js)
*/ */
static PHP_GINIT_FUNCTION(v8js) static PHP_GINIT_FUNCTION(v8js)
{ {
#ifdef ZTS
v8js_globals->extensions = NULL; v8js_globals->extensions = NULL;
v8js_globals->v8_initialized = 0; v8js_globals->v8_initialized = 0;
v8js_globals->v8_flags = NULL; v8js_globals->v8_flags = NULL;
@ -1683,6 +1679,7 @@ static PHP_GINIT_FUNCTION(v8js)
new(&v8js_globals->timer_mutex) std::mutex; new(&v8js_globals->timer_mutex) std::mutex;
new(&v8js_globals->timer_stack) std::stack<php_v8js_timer_ctx *>; new(&v8js_globals->timer_stack) std::stack<php_v8js_timer_ctx *>;
new(&v8js_globals->modules_loaded) std::map<char *, v8::Handle<v8::Object>>; new(&v8js_globals->modules_loaded) std::map<char *, v8::Handle<v8::Object>>;
#endif
} }
/* }}} */ /* }}} */
@ -1701,7 +1698,7 @@ static PHP_GSHUTDOWN_FUNCTION(v8js)
v8js_globals->v8_flags = NULL; v8js_globals->v8_flags = NULL;
} }
#if 0 #ifdef ZTS
v8js_globals->timer_stack.~stack(); v8js_globals->timer_stack.~stack();
v8js_globals->timer_mutex.~mutex(); v8js_globals->timer_mutex.~mutex();
v8js_globals->modules_loaded.~map(); v8js_globals->modules_loaded.~map();