nodejs
diff --git a/‎src/api/environment.cc‎
Lines changed: 2 additions & 1 deletion b/‎src/api/environment.cc‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎src/env.cc‎
Lines changed: 1 addition & 2 deletions b/‎src/env.cc‎
Lines changed: 1 addition & 2 deletions
diff --git a/‎src/env.h‎
Lines changed: 1 addition & 1 deletion b/‎src/env.h‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/node.cc‎
Lines changed: 1 addition & 1 deletion b/‎src/node.cc‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/node.h‎
Lines changed: 3 additions & 4 deletions b/‎src/node.h‎
Lines changed: 3 additions & 4 deletions
@@ -712,7 +712,8 @@ ThreadId AllocateEnvironmentThreadId() {
 }
 
 void DefaultProcessExitHandler(Environment* env, int exit_code) {
-  Stop(env);
+  env->set_can_call_into_js(false);
+  env->stop_sub_worker_contexts();
   DisposePlatform();
   uv_library_shutdown();
   exit(exit_code);
 
@@ -550,10 +550,9 @@ void Environment::InitializeLibuv(bool start_profiler_idle_notifier) {
   }
 }
 
-void Environment::Stop() {
+void Environment::ExitEnv() {
   set_can_call_into_js(false);
   set_stopping(true);
-  stop_sub_worker_contexts();
   isolate_->TerminateExecution();
   SetImmediateThreadsafe([](Environment* env) { uv_stop(env->event_loop()); });
 }
 
@@ -926,7 +926,7 @@ class Environment : public MemoryRetainer {
   void RegisterHandleCleanups();
   void CleanupHandles();
   void Exit(int code);
-  void Stop();
+  void ExitEnv();
 
   // Register clean-up cb to be called on environment destruction.
   inline void RegisterHandleCleanup(uv_handle_t* handle,
 
@@ -1035,7 +1035,7 @@ int Start(int argc, char** argv) {
 }
 
 int Stop(Environment* env) {
-  env->Stop();
+  env->ExitEnv();
   return 0;
 }
 
 
@@ -218,8 +218,7 @@ class Environment;
 NODE_EXTERN int Start(int argc, char* argv[]);
 
 // Tear down Node.js while it is running (there are active handles
-// in the loop and / or actively executing JavaScript code). This also stops
-// all Workers that may have been started earlier.
+// in the loop and / or actively executing JavaScript code).
 NODE_EXTERN int Stop(Environment* env);
 
 // TODO(addaleax): Officially deprecate this and replace it with something
@@ -469,8 +468,8 @@ NODE_EXTERN void FreeEnvironment(Environment* env);
 // It receives the Environment* instance and the exit code as arguments.
 // This could e.g. call Stop(env); in order to terminate execution and stop
 // the event loop.
-// The default handler calls Stop(), disposes of the global V8 platform
-// instance, if one is being used, and calls exit().
+// The default handler disposes of the global V8 platform instance, if one is
+// being used, and calls exit().
 NODE_EXTERN void SetProcessExitHandler(
     Environment* env,
     std::function<void(Environment*, int)>&& handler);
Original file line number	Diff line number	Diff line change
@@ -712,7 +712,8 @@ ThreadId AllocateEnvironmentThreadId() {
712	712	}
713	713
714	714	void DefaultProcessExitHandler(Environment* env, int exit_code) {
715		- Stop(env);
	715	+ env->set_can_call_into_js(false);
	716	+ env->stop_sub_worker_contexts();
716	717	DisposePlatform();
717	718	uv_library_shutdown();
718	719	exit(exit_code);
Original file line number	Diff line number	Diff line change
@@ -550,10 +550,9 @@ void Environment::InitializeLibuv(bool start_profiler_idle_notifier) {
550	550	}
551	551	}
552	552
553		- void Environment::Stop() {
	553	+ void Environment::ExitEnv() {
554	554	set_can_call_into_js(false);
555	555	set_stopping(true);
556		- stop_sub_worker_contexts();
557	556	isolate_->TerminateExecution();
558	557	SetImmediateThreadsafe([](Environment* env) { uv_stop(env->event_loop()); });
559	558	}
Original file line number	Diff line number	Diff line change
@@ -1035,7 +1035,7 @@ int Start(int argc, char** argv) {
1035	1035	}
1036	1036
1037	1037	int Stop(Environment* env) {
1038		- env->Stop();
	1038	+ env->ExitEnv();
1039	1039	return 0;
1040	1040	}
1041	1041