diff --git a/src/env.cc b/src/env.cc index c5d4f43ecebd8f..341d64f044e72f 100644 --- a/src/env.cc +++ b/src/env.cc @@ -910,10 +910,11 @@ void Environment::InitializeLibuv() { StartProfilerIdleNotifier(); } -void Environment::ExitEnv() { +void Environment::ExitEnv(StopFlags::Flags flags) { // Should not access non-thread-safe methods here. set_stopping(true); - isolate_->TerminateExecution(); + if ((flags & StopFlags::kDoNotTerminateIsolate) == 0) + isolate_->TerminateExecution(); SetImmediateThreadsafe([](Environment* env) { env->set_can_call_into_js(false); uv_stop(env->event_loop()); diff --git a/src/env.h b/src/env.h index d86a97a5858ce1..2ea0d770863015 100644 --- a/src/env.h +++ b/src/env.h @@ -636,7 +636,7 @@ class Environment : public MemoryRetainer { void RegisterHandleCleanups(); void CleanupHandles(); void Exit(ExitCode code); - void ExitEnv(); + void ExitEnv(StopFlags::Flags flags); // Register clean-up cb to be called on environment destruction. inline void RegisterHandleCleanup(uv_handle_t* handle, diff --git a/src/node.cc b/src/node.cc index 9d5687daed76f4..f6ffa26b9b8600 100644 --- a/src/node.cc +++ b/src/node.cc @@ -1248,7 +1248,11 @@ int Start(int argc, char** argv) { } int Stop(Environment* env) { - env->ExitEnv(); + return Stop(env, StopFlags::kNoFlags); +} + +int Stop(Environment* env, StopFlags::Flags flags) { + env->ExitEnv(flags); return 0; } diff --git a/src/node.h b/src/node.h index e6362fc5da6476..f16ac184c90838 100644 --- a/src/node.h +++ b/src/node.h @@ -276,6 +276,15 @@ enum Flags : uint64_t { // TODO(addaleax): Make this the canonical name, as it is more descriptive. namespace ProcessInitializationFlags = ProcessFlags; +namespace StopFlags { +enum Flags : uint32_t { + kNoFlags = 0, + // Do not explicitly terminate the Isolate + // when exiting the Environment. + kDoNotTerminateIsolate = 1 << 0, +}; +} // namespace StopFlags + class NODE_EXTERN InitializationResult { public: virtual ~InitializationResult(); @@ -312,6 +321,7 @@ 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). NODE_EXTERN int Stop(Environment* env); +NODE_EXTERN int Stop(Environment* env, StopFlags::Flags flags); // Set up per-process state needed to run Node.js. This will consume arguments // from argv, fill exec_argv, and possibly add errors resulting from parsing