1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

node: un-revert 9a6012e

Browse Source 
The crashes in debug mode after adding Locker are *not* caused by
Locker. Locker is merely exposing issues that already existed. Some of
these issues have since been fixed in 70635753.

This reverts commit 407181538b5193f6810bf06a2056a200265c0e93.
This reapplies commit 9a6012edd9330296b7476bc6b7fbda2cd5c8165d.

Conflicts:
	src/node.cc
This commit is contained in:
Marcel Laverdet 2012-05-04 17:29:42 -05:00 committed by Ben Noordhuis
parent ebbd4039bc
commit c33d3174b8
1 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/node.cc
View File

@ -2858,34 +2858,40 @@ int Start(int argc, char *argv[]) {
// Use copy here as to not modify the original argv: // Use copy here as to not modify the original argv:
Init(argc, argv_copy); Init(argc, argv_copy);
v8::V8::Initialize(); V8::Initialize();
v8::HandleScope handle_scope; {
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);
// Use original argv, as we're just copying values out of it. // Use original argv, as we're just copying values out of it.
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());
// Create all the objects, load modules, do everything. // Create all the objects, load modules, do everything.
// so your next reading stop should be node::Load()! // so your next reading stop should be node::Load()!
Load(process_l); Load(process_l);
// All our arguments are loaded. We've evaluated all of the scripts. We // All our arguments are loaded. We've evaluated all of the scripts. We
// might even have created TCP servers. Now we enter the main eventloop. If // might even have created TCP servers. Now we enter the main eventloop. If
// there are no watchers on the loop (except for the ones that were // there are no watchers on the loop (except for the ones that were
// uv_unref'd) then this function exits. As long as there are active // uv_unref'd) then this function exits. As long as there are active
// watchers, it blocks. // watchers, it blocks.
uv_run(uv_default_loop()); uv_run(uv_default_loop());
EmitExit(process_l); EmitExit(process_l);
RunAtExit(); RunAtExit();
#ifndef NDEBUG #ifndef NDEBUG
// Clean up. context.Dispose();
context.Dispose(); #endif
}
#ifndef NDEBUG
// Clean up. Not strictly necessary.
V8::Dispose(); V8::Dispose();
#endif // NDEBUG #endif // NDEBUG