diff --git a/src/env.cc b/src/env.cc index 692a344703a196..172386993dbd74 100644 --- a/src/env.cc +++ b/src/env.cc @@ -911,10 +911,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 c2eb764e740400..31f4a10b11b79a 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 f92be4b089db87..994a2f67701bda 100644 --- a/src/node.cc +++ b/src/node.cc @@ -1254,7 +1254,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 48477e970829c3..3a11d0378bfed8 100644 --- a/src/node.h +++ b/src/node.h @@ -273,6 +273,15 @@ enum Flags : uint32_t { } // namespace ProcessInitializationFlags namespace ProcessFlags = ProcessInitializationFlags; // Legacy alias. +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(); @@ -309,6 +318,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