@@ -105,6 +105,8 @@ Persistent<String> domain_symbol;
105105// declared in node_internals.h
106106Persistent<Object> process;
107107
108+ static Persistent<Array> domains_stack;
109+
108110static Persistent<Function> process_tickFromSpinner;
109111static Persistent<Function> process_tickCallback;
110112
@@ -126,6 +128,8 @@ static Persistent<String> exit_symbol;
126128static Persistent<String> disposed_symbol;
127129
128130static Persistent<String> emitting_toplevel_domain_error_symbol;
131+ static Persistent<String> _events_symbol;
132+ static Persistent<String> error_symbol;
129133
130134static bool print_eval = false ;
131135static bool force_repl = false ;
@@ -904,25 +908,77 @@ Handle<Value> FromConstructorTemplate(Persistent<FunctionTemplate> t,
904908 return scope.Close (t->GetFunction ()->NewInstance (argc, argv));
905909}
906910
907- static bool IsDomainActive () {
908- if (domain_symbol.IsEmpty ())
909- domain_symbol = NODE_PSYMBOL (" domain" );
911+ static bool DomainHasErrorHandler (const Local<Object>& domain) {
912+ HandleScope scope;
913+
914+ if (_events_symbol.IsEmpty ())
915+ _events_symbol = NODE_PSYMBOL (" _events" );
916+
917+ Local<Value> domain_event_listeners_v = domain->Get (_events_symbol);
918+ if (!domain_event_listeners_v->IsObject ())
919+ return false ;
920+
921+ Local<Object> domain_event_listeners_o =
922+ domain_event_listeners_v.As <Object>();
923+
924+ if (error_symbol.IsEmpty ())
925+ error_symbol = NODE_PSYMBOL (" error" );
926+
927+ Local<Value> domain_error_listeners_v =
928+ domain_event_listeners_o->Get (error_symbol);
929+
930+ if (domain_error_listeners_v->IsFunction () ||
931+ (domain_error_listeners_v->IsArray () &&
932+ domain_error_listeners_v.As <Array>()->Length () > 0 ))
933+ return true ;
934+
935+ return false ;
936+ }
937+
938+ static bool TopDomainHasErrorHandler () {
939+ HandleScope scope;
940+
941+ if (!using_domains)
942+ return false ;
910943
911- Local<Value> domain_v = process->Get (domain_symbol);
944+ Local<Array> domains_stack_array = Local<Array>::New (domains_stack);
945+ if (domains_stack_array->Length () == 0 )
946+ return false ;
912947
913- return domain_v->IsObject ();
948+ uint32_t domains_stack_length = domains_stack_array->Length ();
949+ if (domains_stack_length == 0 )
950+ return false ;
951+
952+ Local<Value> domain_v = domains_stack_array->Get (domains_stack_length - 1 );
953+ if (!domain_v->IsObject ())
954+ return false ;
955+
956+ Local<Object> domain = domain_v.As <Object>();
957+ if (DomainHasErrorHandler (domain))
958+ return true ;
959+
960+ return false ;
914961}
915962
916963bool ShouldAbortOnUncaughtException () {
917964 Local<Value> emitting_toplevel_domain_error_v =
918965 process->Get (emitting_toplevel_domain_error_symbol);
919- return !IsDomainActive () || emitting_toplevel_domain_error_v->BooleanValue ();
966+
967+ return emitting_toplevel_domain_error_v->BooleanValue () ||
968+ !TopDomainHasErrorHandler ();
920969}
921970
922971Handle<Value> UsingDomains (const Arguments& args) {
923972 HandleScope scope;
973+
924974 if (using_domains)
925975 return scope.Close (Undefined ());
976+
977+ if (!args[0 ]->IsArray ()) {
978+ fprintf (stderr, " domains stack must be an array\n " );
979+ abort ();
980+ }
981+
926982 using_domains = true ;
927983 Local<Value> tdc_v = process->Get (String::New (" _tickDomainCallback" ));
928984 Local<Value> ndt_v = process->Get (String::New (" _nextDomainTick" ));
@@ -934,6 +990,9 @@ Handle<Value> UsingDomains(const Arguments& args) {
934990 fprintf (stderr, " process._nextDomainTick assigned to non-function\n " );
935991 abort ();
936992 }
993+
994+ domains_stack = Persistent<Array>::New (args[0 ].As <Array>());
995+
937996 Local<Function> tdc = tdc_v.As <Function>();
938997 Local<Function> ndt = ndt_v.As <Function>();
939998 process->Set (String::New (" _tickCallback" ), tdc);
@@ -2449,7 +2508,10 @@ Handle<Object> SetupProcessObject(int argc, char *argv[]) {
24492508 process->Set (String::NewSymbol (" _tickInfoBox" ), info_box);
24502509
24512510 // pre-set _events object for faster emit checks
2452- process->Set (String::NewSymbol (" _events" ), Object::New ());
2511+ if (_events_symbol.IsEmpty ())
2512+ _events_symbol = NODE_PSYMBOL (" _events" );
2513+
2514+ process->Set (_events_symbol, Object::New ());
24532515
24542516 if (emitting_toplevel_domain_error_symbol.IsEmpty ())
24552517 emitting_toplevel_domain_error_symbol =
0 commit comments