mirrors/phpv8
mirrors/phpv8
0
0
Fork 0
mirror of https://github.com/phpv8/v8js.git synced 2024-11-08 20:08:41 +00:00
Code Releases Activity

Initialize v8js_globals manually only if ZTS is enabled.

Browse Source 
If ZTS is disabled, the v8js_globals instance is declared right
in the BSS and hence automatically initialized by C++ compiler.
Most of the variables are just zeroed.

If ZTS is enabled however, v8js_globals just points to a freshly
allocated, unitialized piece of memory, hence we need to
initialize all fields on our own.  Likewise on shutdown we have to
run the destructors manually.
This commit is contained in:
Stefan Siegl 2013-10-27 00:29:50 +02:00
parent 5c1c68b045
commit c3512587ac
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

@ -1538,11 +1538,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);
@ -1701,6 +1696,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->disposed_contexts = 0; v8js_globals->disposed_contexts = 0;
v8js_globals->max_disposed_contexts = 0; v8js_globals->max_disposed_contexts = 0;
@ -1711,6 +1707,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
} }
/* }}} */ /* }}} */
@ -1729,7 +1726,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();