base/trace_event/common/trace_event_common.h - Issue 2253973003: Add an explicit way of making IDs local or global

Unified Diff: base/trace_event/common/trace_event_common.h

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/common/trace_event_common.h

diff --git a/base/trace_event/common/trace_event_common.h b/base/trace_event/common/trace_event_common.h

index 0c16e7b72382d3d56b17df4761798cc6f6bc202a..0d508cda4424fa7f6248181adb2fda59017ad353 100644

--- a/base/trace_event/common/trace_event_common.h

+++ b/base/trace_event/common/trace_event_common.h

@@ -965,41 +965,40 @@

// See also TraceTrackableObject.

#define TRACE_EVENT_OBJECT_CREATED_WITH_ID(category_group, name, id) \

INTERNAL_TRACE_EVENT_ADD_WITH_ID( \

- TRACE_EVENT_PHASE_CREATE_OBJECT, category_group, name, \

- TRACE_ID_DONT_MANGLE(id), TRACE_EVENT_FLAG_NONE)

+ TRACE_EVENT_PHASE_CREATE_OBJECT, category_group, name, id, \

+ TRACE_EVENT_FLAG_NONE)

#define TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID(category_group, name, id, \

snapshot) \

INTERNAL_TRACE_EVENT_ADD_WITH_ID( \

TRACE_EVENT_PHASE_SNAPSHOT_OBJECT, category_group, name, \

- TRACE_ID_DONT_MANGLE(id), TRACE_EVENT_FLAG_NONE, "snapshot", snapshot)

+ id, TRACE_EVENT_FLAG_NONE, "snapshot", snapshot)

-#define TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID_AND_TIMESTAMP( \

- category_group, name, id, timestamp, snapshot) \

- INTERNAL_TRACE_EVENT_ADD_WITH_ID_TID_AND_TIMESTAMP( \

- TRACE_EVENT_PHASE_SNAPSHOT_OBJECT, category_group, name, \

- TRACE_ID_DONT_MANGLE(id), TRACE_EVENT_API_CURRENT_THREAD_ID, timestamp, \

- TRACE_EVENT_FLAG_NONE, "snapshot", snapshot)

+#define TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID_AND_TIMESTAMP( \

+ category_group, name, id, timestamp, snapshot) \

+ INTERNAL_TRACE_EVENT_ADD_WITH_ID_TID_AND_TIMESTAMP( \

+ TRACE_EVENT_PHASE_SNAPSHOT_OBJECT, category_group, name, \

+ id, TRACE_EVENT_API_CURRENT_THREAD_ID, timestamp, TRACE_EVENT_FLAG_NONE, \

+ "snapshot", snapshot)

#define TRACE_EVENT_OBJECT_DELETED_WITH_ID(category_group, name, id) \

INTERNAL_TRACE_EVENT_ADD_WITH_ID( \

- TRACE_EVENT_PHASE_DELETE_OBJECT, category_group, name, \

- TRACE_ID_DONT_MANGLE(id), TRACE_EVENT_FLAG_NONE)

+ TRACE_EVENT_PHASE_DELETE_OBJECT, category_group, name, id, \

+ TRACE_EVENT_FLAG_NONE)

// Records entering and leaving trace event contexts. |category_group| and

// |name| specify the context category and type. |context| is a

// snapshotted context object id.

-#define TRACE_EVENT_ENTER_CONTEXT(category_group, name, context) \

- INTERNAL_TRACE_EVENT_ADD_WITH_ID( \

- TRACE_EVENT_PHASE_ENTER_CONTEXT, category_group, name, \

- TRACE_ID_DONT_MANGLE(context), TRACE_EVENT_FLAG_NONE)

-#define TRACE_EVENT_LEAVE_CONTEXT(category_group, name, context) \

- INTERNAL_TRACE_EVENT_ADD_WITH_ID( \

- TRACE_EVENT_PHASE_LEAVE_CONTEXT, category_group, name, \

- TRACE_ID_DONT_MANGLE(context), TRACE_EVENT_FLAG_NONE)

+#define TRACE_EVENT_ENTER_CONTEXT(category_group, name, context) \

+ INTERNAL_TRACE_EVENT_ADD_WITH_ID( \

+ TRACE_EVENT_PHASE_ENTER_CONTEXT, category_group, name, context, \

+ TRACE_EVENT_FLAG_NONE)

+#define TRACE_EVENT_LEAVE_CONTEXT(category_group, name, context) \

+ INTERNAL_TRACE_EVENT_ADD_WITH_ID( \

+ TRACE_EVENT_PHASE_LEAVE_CONTEXT, category_group, name, context, \

+ TRACE_EVENT_FLAG_NONE)

#define TRACE_EVENT_SCOPED_CONTEXT(category_group, name, context) \

- INTERNAL_TRACE_EVENT_SCOPED_CONTEXT(category_group, name, \

- TRACE_ID_DONT_MANGLE(context))

+ INTERNAL_TRACE_EVENT_SCOPED_CONTEXT(category_group, name, context)

// Macro to specify that two trace IDs are identical. For example,

// TRACE_BIND_IDS(

@@ -1083,6 +1082,7 @@

#define TRACE_EVENT_FLAG_NONE (static_cast<unsigned int>(0))

#define TRACE_EVENT_FLAG_COPY (static_cast<unsigned int>(1 << 0))

#define TRACE_EVENT_FLAG_HAS_ID (static_cast<unsigned int>(1 << 1))

+// TODO(crbug.com/639003): Free this bit after ID mangling is deprecated.

#define TRACE_EVENT_FLAG_MANGLE_ID (static_cast<unsigned int>(1 << 2))

#define TRACE_EVENT_FLAG_SCOPE_OFFSET (static_cast<unsigned int>(1 << 3))

#define TRACE_EVENT_FLAG_SCOPE_EXTRA (static_cast<unsigned int>(1 << 4))

@@ -1093,7 +1093,11 @@

#define TRACE_EVENT_FLAG_FLOW_OUT (static_cast<unsigned int>(1 << 9))

#define TRACE_EVENT_FLAG_HAS_CONTEXT_ID (static_cast<unsigned int>(1 << 10))

#define TRACE_EVENT_FLAG_HAS_PROCESS_ID (static_cast<unsigned int>(1 << 11))

+#define TRACE_EVENT_FLAG_HAS_LOCAL_ID (static_cast<unsigned int>(1 << 12))

+#define TRACE_EVENT_FLAG_HAS_GLOBAL_ID (static_cast<unsigned int>(1 << 1 | \

+ 1 << 12))

+#define TRACE_EVENT_FLAG_ID_MASK (static_cast<unsigned int>(1 << 1 | 1 << 12))

caseq 2016/08/29 23:39:26 please define in terms of other constants, i.e. so

chiniforooshan 2016/08/30 17:40:46 Done.

#define TRACE_EVENT_FLAG_SCOPE_MASK \

(static_cast<unsigned int>(TRACE_EVENT_FLAG_SCOPE_OFFSET | \

TRACE_EVENT_FLAG_SCOPE_EXTRA))

« base/trace_event/blame_context.cc ('K') | « base/trace_event/blame_context.cc ('k') | base/trace_event/trace_event.h » ('j') | base/trace_event/trace_event.h » ('J')