src: dispose of V8 platform in process.exit()

addaleax · BethGriggs · commit 25ca9f177bb1 · 2019-03-27T11:37:00.000Z
Calling `process.exit()` calls the C `exit()` function, which in turn calls the destructors of static C++ objects. This can lead to race conditions with other concurrently executing threads; disposing of all Worker threads and then the V8 platform instance helps with this (although it might not be a full solution for all problems of this kind). Refs: nodejs#24403 Refs: nodejs#25007 PR-URL: nodejs#25061 Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com> Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
diff --git a/src/env.cc b/src/env.cc
@@ -673,10 +673,13 @@ void Environment::AsyncHooks::grow_async_ids_stack() {
 uv_key_t Environment::thread_local_env = {};
 
 void Environment::Exit(int exit_code) {
-  if (is_main_thread())
+  if (is_main_thread()) {
+    stop_sub_worker_contexts();
+    DisposePlatform();
     exit(exit_code);
-  else
+  } else {
     worker_context_->Exit(exit_code);
+  }
 }
 
 void Environment::stop_sub_worker_contexts() {
diff --git a/src/node.cc b/src/node.cc
@@ -383,6 +383,10 @@ static struct {
 #endif  //  !NODE_USE_V8_PLATFORM || !HAVE_INSPECTOR
 } v8_platform;
 
+void DisposePlatform() {
+  v8_platform.Dispose();
+}
+
 #ifdef __POSIX__
 static const unsigned kMaxSignal = 32;
 #endif
diff --git a/src/node_internals.h b/src/node_internals.h
@@ -538,6 +538,8 @@ int ThreadPoolWork::CancelWork() {
   return uv_cancel(reinterpret_cast<uv_req_t*>(&work_req_));
 }
 
+void DisposePlatform();
+
 static inline const char* errno_string(int errorno) {
 #define ERRNO_CASE(e)  case e: return #e;
   switch (errorno) {

Original file line number	Diff line number	Diff line change
`@@ -538,6 +538,8 @@ int ThreadPoolWork::CancelWork() {`
`538`	`538`	`return uv_cancel(reinterpret_cast<uv_req_t*>(&work_req_));`
`539`	`539`	`}`
`540`	`540`
	`541`	`+void DisposePlatform();`
	`542`	`+`
`541`	`543`	`static inline const char* errno_string(int errorno) {`
`542`	`544`	`#define ERRNO_CASE(e) case e: return #e;`
`543`	`545`	`switch (errorno) {`