src: shutdown platform from FreePlatform()

addaleax · addaleax · commit a8cf886de723 · 2020-03-21T10:58:19.000+01:00
There is currently no way to properly do this. 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
@@ -338,6 +338,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_);
   auto delegate = std::make_shared<PerIsolatePlatformData>(isolate, loop);
@@ -381,6 +385,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
@@ -140,7 +140,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();
@@ -180,6 +180,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
`@@ -338,6 +338,10 @@ NodePlatform::NodePlatform(int thread_pool_size,`
`338`	`338`	`std::make_shared<WorkerThreadsTaskRunner>(thread_pool_size);`
`339`	`339`	`}`
`340`	`340`
	`341`	`+NodePlatform::~NodePlatform() {`
	`342`	`+ Shutdown();`
	`343`	`+}`
	`344`	`+`
`341`	`345`	`void NodePlatform::RegisterIsolate(Isolate* isolate, uv_loop_t* loop) {`
`342`	`346`	`Mutex::ScopedLock lock(per_isolate_mutex_);`
`343`	`347`	`auto delegate = std::make_shared<PerIsolatePlatformData>(isolate, loop);`
`@@ -381,6 +385,8 @@ void NodePlatform::AddIsolateFinishedCallback(Isolate* isolate,`
`381`	`385`	`}`
`382`	`386`
`383`	`387`	`void NodePlatform::Shutdown() {`
	`388`	`+ if (has_shut_down_) return;`
	`389`	`+ has_shut_down_ = true;`
`384`	`390`	`worker_thread_task_runner_->Shutdown();`
`385`	`391`
`386`	`392`	`{`