Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4377)

Unified Diff: base/trace_event/trace_log.cc

Issue 1588563004: tracing: Fix AddMetadataEvent race in presence of Convertable arguments (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/trace_event/trace_log.cc
diff --git a/base/trace_event/trace_log.cc b/base/trace_event/trace_log.cc
index c36550a95722f7336854b10150ab711869a6a1fe..c2d4b282b71ec72c46f09c53c2febd5d51a539b9 100644
--- a/base/trace_event/trace_log.cc
+++ b/base/trace_event/trace_log.cc
@@ -1350,6 +1350,7 @@ void TraceLog::AddMetadataEvent(
const scoped_refptr<ConvertableToTraceFormat>* convertable_values,
unsigned int flags) {
scoped_ptr<TraceEvent> trace_event(new TraceEvent);
+ AutoLock lock(lock_);
trace_event->Initialize(
0, // thread_id
TimeTicks(), ThreadTicks(), TRACE_EVENT_PHASE_METADATA,
@@ -1357,7 +1358,6 @@ void TraceLog::AddMetadataEvent(
trace_event_internal::kNoId, // id
trace_event_internal::kNoId, // bind_id
num_args, arg_names, arg_types, arg_values, convertable_values, flags);
- AutoLock lock(lock_);
metadata_events_.push_back(std::move(trace_event));
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698