daohualiuxiang
/
node
mirror of https://github.com/nodejs/node.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Re-add top-level v8::Locker 

11d1eca9 added a v8 locker to ease development of 3rd party threading
extensions but it created a condition which would cause node to exit
uncleanly while in debug mode; it was reverted in 7543c38d.

The problem here is that the Locker was being disposed after V8 was torn
down. Adding some scoping fixes that.
v0.7.4-release
Marcel Laverdet 2012-02-07 18:10:22 -06:00 committed by Ben Noordhuis
parent e612143a89
commit 9a6012edd9
1 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/node.cc
View File

@ -2644,12 +2644,15 @@ int Start(int argc, char *argv[]) {
// This needs to run *before* V8::Initialize() // This needs to run *before* V8::Initialize()
argv = Init(argc, argv); argv = Init(argc, argv);
v8::V8::Initialize(); V8::Initialize();
v8::HandleScope handle_scope; Persistent<Context> context;
{
Locker locker;
HandleScope handle_scope;
// Create the one and only Context. // Create the one and only Context.
Persistent<v8::Context> context = v8::Context::New(); Persistent<Context> context = Context::New();
v8::Context::Scope context_scope(context); Context::Scope context_scope(context);
Handle<Object> process_l = SetupProcessObject(argc, argv); Handle<Object> process_l = SetupProcessObject(argc, argv);
v8_typed_array::AttachBindings(context->Global()); v8_typed_array::AttachBindings(context->Global());
@ -2666,10 +2669,13 @@ int Start(int argc, char *argv[]) {
uv_run(uv_default_loop()); uv_run(uv_default_loop());
EmitExit(process_l); EmitExit(process_l);
#ifndef NDEBUG
context.Dispose();
#endif
}
#ifndef NDEBUG #ifndef NDEBUG
// Clean up. // Clean up.
context.Dispose();
V8::Dispose(); V8::Dispose();
#endif // NDEBUG #endif // NDEBUG