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

Unified Diff: base/trace_event/trace_event_impl.cc

Issue 2253973003: Add an explicit way of making IDs local or global (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: comments Created 4 years, 4 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
Index: base/trace_event/trace_event_impl.cc
diff --git a/base/trace_event/trace_event_impl.cc b/base/trace_event/trace_event_impl.cc
index 510cc2ffac6b32add118eb53ed4147b4b70369d9..349e54ebc7a4ebd4d9d4be380a0442c21949d617 100644
--- a/base/trace_event/trace_event_impl.cc
+++ b/base/trace_event/trace_event_impl.cc
@@ -358,10 +358,15 @@ void TraceEvent::AppendAsJSON(
// If id_ is set, print it out as a hex string so we don't loose any
// bits (it might be a 64-bit pointer).
- if (flags_ & TRACE_EVENT_FLAG_HAS_ID) {
+ unsigned int id_flags = flags_ & TRACE_EVENT_FLAG_ID_MASK;
+ if (id_flags != TRACE_EVENT_FLAG_NONE) {
if (scope_ != trace_event_internal::kGlobalScope)
StringAppendF(out, ",\"scope\":\"%s\"", scope_);
StringAppendF(out, ",\"id\":\"0x%" PRIx64 "\"", static_cast<uint64_t>(id_));
+ if (id_flags == TRACE_EVENT_FLAG_HAS_LOCAL_ID)
+ *out += ",\"id_is_global\":false";
+ if (id_flags == TRACE_EVENT_FLAG_HAS_GLOBAL_ID)
+ *out += ",\"id_is_global\":true";
}
if (flags_ & TRACE_EVENT_FLAG_BIND_TO_ENCLOSING)

Powered by Google App Engine
This is Rietveld 408576698