src: allow optional Isolate termination in node::Stop()

codebytere · danielleadams · commit ea411d642200 · 2023-04-03T07:49:38.000-04:00
PR-URL: #46583 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
diff --git a/src/env.cc b/src/env.cc
@@ -902,10 +902,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
@@ -628,7 +628,7 @@ class Environment : public MemoryRetainer {
   void RegisterHandleCleanups();
   void CleanupHandles();
   void Exit(int 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
@@ -1231,7 +1231,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
@@ -274,6 +274,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();
@@ -310,6 +319,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);
 
 // This runs a subset of the initialization performed by
 // InitializeOncePerProcess(), which supersedes this function.

Original file line number	Diff line number	Diff line change
`@@ -1231,7 +1231,11 @@ int Start(int argc, char** argv) {`
`1231`	`1231`	`}`
`1232`	`1232`
`1233`	`1233`	`int Stop(Environment* env) {`
`1234`		`- env->ExitEnv();`
	`1234`	`+ return Stop(env, StopFlags::kNoFlags);`
	`1235`	`+}`
	`1236`	`+`
	`1237`	`+int Stop(Environment* env, StopFlags::Flags flags) {`
	`1238`	`+ env->ExitEnv(flags);`
`1235`	`1239`	`return 0;`
`1236`	`1240`	`}`
`1237`	`1241`