nodejs
diff --git a/‎src/tracing/node_trace_writer.cc‎
Lines changed: 3 additions & 5 deletions b/‎src/tracing/node_trace_writer.cc‎
Lines changed: 3 additions & 5 deletions
diff --git a/‎src/tracing/node_trace_writer.h‎
Lines changed: 1 addition & 1 deletion b/‎src/tracing/node_trace_writer.h‎
Lines changed: 1 addition & 1 deletion
@@ -37,9 +37,7 @@ void NodeTraceWriter::WriteSuffix() {
   {
     Mutex::ScopedLock scoped_lock(stream_mutex_);
     if (total_traces_ > 0) {
-      total_traces_ = 0;  // so we don't write it again in FlushPrivate
-      // Appends "]}" to stream_.
-      delete json_trace_writer_;
+      total_traces_ = kTracesPerFile;  // Act as if we reached the file limit.
       should_flush = true;
     }
   }
@@ -111,7 +109,7 @@ void NodeTraceWriter::AppendTraceEvent(TraceObject* trace_event) {
     // to a state where we can start writing trace events to it.
     // Repeatedly constructing and destroying json_trace_writer_ allows
     // us to use V8's JSON writer instead of implementing our own.
-    json_trace_writer_ = TraceWriter::CreateJSONTraceWriter(stream_);
+    json_trace_writer_.reset(TraceWriter::CreateJSONTraceWriter(stream_));
   }
   ++total_traces_;
   json_trace_writer_->AppendTraceEvent(trace_event);
@@ -126,7 +124,7 @@ void NodeTraceWriter::FlushPrivate() {
       total_traces_ = 0;
       // Destroying the member JSONTraceWriter object appends "]}" to
       // stream_ - in other words, ending a JSON file.
-      delete json_trace_writer_;
+      json_trace_writer_.reset();
     }
     // str() makes a copy of the contents of the stream.
     str = stream_.str();
 
@@ -63,7 +63,7 @@ class NodeTraceWriter : public AsyncTraceWriter {
   int file_num_ = 0;
   const std::string& log_file_pattern_;
   std::ostringstream stream_;
-  TraceWriter* json_trace_writer_ = nullptr;
+  std::unique_ptr<TraceWriter> json_trace_writer_;
   bool exited_ = false;
 };
Original file line number	Diff line number	Diff line change
@@ -37,9 +37,7 @@ void NodeTraceWriter::WriteSuffix() {
37	37	{
38	38	Mutex::ScopedLock scoped_lock(stream_mutex_);
39	39	if (total_traces_ > 0) {
40		- total_traces_ = 0; // so we don't write it again in FlushPrivate
41		- // Appends "]}" to stream_.
42		- delete json_trace_writer_;
	40	+ total_traces_ = kTracesPerFile; // Act as if we reached the file limit.
43	41	should_flush = true;
44	42	}
45	43	}
@@ -111,7 +109,7 @@ void NodeTraceWriter::AppendTraceEvent(TraceObject* trace_event) {
111	109	// to a state where we can start writing trace events to it.
112	110	// Repeatedly constructing and destroying json_trace_writer_ allows
113	111	// us to use V8's JSON writer instead of implementing our own.
114		- json_trace_writer_ = TraceWriter::CreateJSONTraceWriter(stream_);
	112	+ json_trace_writer_.reset(TraceWriter::CreateJSONTraceWriter(stream_));
115	113	}
116	114	++total_traces_;
117	115	json_trace_writer_->AppendTraceEvent(trace_event);
@@ -126,7 +124,7 @@ void NodeTraceWriter::FlushPrivate() {
126	124	total_traces_ = 0;
127	125	// Destroying the member JSONTraceWriter object appends "]}" to
128	126	// stream_ - in other words, ending a JSON file.
129		- delete json_trace_writer_;
	127	+ json_trace_writer_.reset();
130	128	}
131	129	// str() makes a copy of the contents of the stream.
132	130	str = stream_.str();