src: shutdown platform from FreePlatform()

addaleax · addaleax · commit b8c9048a87c3 · 2020-09-23T20:02:11.000+02:00
There is currently no way to properly do this. Backport-PR-URL: #35241 PR-URL: #30467 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
diff --git a/src/node_platform.cc b/src/node_platform.cc
@@ -333,6 +333,10 @@ NodePlatform::NodePlatform(int thread_pool_size,
       std::make_shared<WorkerThreadsTaskRunner>(thread_pool_size);
 }
 
+NodePlatform::~NodePlatform() {
+  Shutdown();
+}
+
 void NodePlatform::RegisterIsolate(Isolate* isolate, uv_loop_t* loop) {
   Mutex::ScopedLock lock(per_isolate_mutex_);
   std::shared_ptr<PerIsolatePlatformData> existing = per_isolate_[isolate];
@@ -362,6 +366,8 @@ void NodePlatform::AddIsolateFinishedCallback(Isolate* isolate,
 }
 
 void NodePlatform::Shutdown() {
+  if (has_shut_down_) return;
+  has_shut_down_ = true;
   worker_thread_task_runner_->Shutdown();
 
   {
diff --git a/src/node_platform.h b/src/node_platform.h
@@ -138,7 +138,7 @@ class NodePlatform : public MultiIsolatePlatform {
  public:
   NodePlatform(int thread_pool_size,
                v8::TracingController* tracing_controller);
-  ~NodePlatform() override = default;
+  ~NodePlatform() override;
 
   void DrainTasks(v8::Isolate* isolate) override;
   void Shutdown();
@@ -181,6 +181,7 @@ class NodePlatform : public MultiIsolatePlatform {
 
   v8::TracingController* tracing_controller_;
   std::shared_ptr<WorkerThreadsTaskRunner> worker_thread_task_runner_;
+  bool has_shut_down_ = false;
 };
 
 }  // namespace node

Original file line number	Diff line number	Diff line change
`@@ -333,6 +333,10 @@ NodePlatform::NodePlatform(int thread_pool_size,`
`333`	`333`	`std::make_shared<WorkerThreadsTaskRunner>(thread_pool_size);`
`334`	`334`	`}`
`335`	`335`
	`336`	`+NodePlatform::~NodePlatform() {`
	`337`	`+ Shutdown();`
	`338`	`+}`
	`339`	`+`
`336`	`340`	`void NodePlatform::RegisterIsolate(Isolate* isolate, uv_loop_t* loop) {`
`337`	`341`	`Mutex::ScopedLock lock(per_isolate_mutex_);`
`338`	`342`	`std::shared_ptr<PerIsolatePlatformData> existing = per_isolate_[isolate];`
`@@ -362,6 +366,8 @@ void NodePlatform::AddIsolateFinishedCallback(Isolate* isolate,`
`362`	`366`	`}`
`363`	`367`
`364`	`368`	`void NodePlatform::Shutdown() {`
	`369`	`+ if (has_shut_down_) return;`
	`370`	`+ has_shut_down_ = true;`
`365`	`371`	`worker_thread_task_runner_->Shutdown();`
`366`	`372`
`367`	`373`	`{`