src: clean up agent loop when exiting through destructor

addaleax · targos · commit 00c33a513157 · 2018-08-01T21:36:36.000+02:00
Fixes: #22042 PR-URL: #21867 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Eugene Ostroukhov <eostroukhov@google.com> Reviewed-By: Ali Ijaz Sheikh <ofrobots@google.com>
diff --git a/src/node.cc b/src/node.cc
@@ -398,10 +398,10 @@ static struct {
   }
 
   void Dispose() {
+    tracing_agent_.reset(nullptr);
     platform_->Shutdown();
     delete platform_;
     platform_ = nullptr;
-    tracing_agent_.reset(nullptr);
   }
 
   void DrainVMTasks(Isolate* isolate) {
diff --git a/src/tracing/agent.cc b/src/tracing/agent.cc
@@ -59,6 +59,7 @@ Agent::Agent() {
     Agent* agent = ContainerOf(&Agent::initialize_writer_async_, async);
     agent->InitializeWritersOnThread();
   }), 0);
+  uv_unref(reinterpret_cast<uv_handle_t*>(&initialize_writer_async_));
 }
 
 void Agent::InitializeWritersOnThread() {
@@ -72,6 +73,11 @@ void Agent::InitializeWritersOnThread() {
 }
 
 Agent::~Agent() {
+  categories_.clear();
+  writers_.clear();
+
+  StopTracing();
+
   uv_close(reinterpret_cast<uv_handle_t*>(&initialize_writer_async_), nullptr);
   uv_run(&tracing_loop_, UV_RUN_ONCE);
   CheckedUvLoopClose(&tracing_loop_);

Original file line number	Diff line number	Diff line change
`@@ -398,10 +398,10 @@ static struct {`
`398`	`398`	`}`
`399`	`399`
`400`	`400`	`void Dispose() {`
	`401`	`+ tracing_agent_.reset(nullptr);`
`401`	`402`	`platform_->Shutdown();`
`402`	`403`	`delete platform_;`
`403`	`404`	`platform_ = nullptr;`
`404`		`- tracing_agent_.reset(nullptr);`
`405`	`405`	`}`
`406`	`406`
`407`	`407`	`void DrainVMTasks(Isolate* isolate) {`