Index: base/debug/trace_event.h |
diff --git a/base/debug/trace_event.h b/base/debug/trace_event.h |
index 18feb33f3d0754897156a84c5027a7a64e9441dc..8fdeace61a096550fe27c5a6a9cdbe442f1570e5 100644 |
--- a/base/debug/trace_event.h |
+++ b/base/debug/trace_event.h |
@@ -725,12 +725,18 @@ |
INTERNAL_TRACE_EVENT_ADD_WITH_ID(TRACE_EVENT_PHASE_DELETE_OBJECT, \ |
category_group, name, TRACE_ID_DONT_MANGLE(id), TRACE_EVENT_FLAG_NONE) |
+#define TRACE_EVENT_CATEGORY_GROUP_ENABLED_FOR_RECORDING_MODE( \ |
Xianzhu
2013/12/19 01:01:05
Nit: I think this macro should be prefixed with IN
haraken
2013/12/19 01:34:02
Done.
|
+ category_group_enabled) \ |
+ *INTERNAL_TRACE_EVENT_UID(category_group_enabled) & \ |
+ (base::debug::TraceLog::ENABLED_FOR_RECORDING | \ |
+ base::debug::TraceLog::ENABLED_FOR_EVENT_CALLBACK) |
// Macro to efficiently determine if a given category group is enabled. |
#define TRACE_EVENT_CATEGORY_GROUP_ENABLED(category_group, ret) \ |
do { \ |
INTERNAL_TRACE_EVENT_GET_CATEGORY_INFO(category_group); \ |
- if (*INTERNAL_TRACE_EVENT_UID(category_group_enabled)) { \ |
+ if (TRACE_EVENT_CATEGORY_GROUP_ENABLED_FOR_RECORDING_MODE( \ |
+ category_group_enabled)) { \ |
*ret = true; \ |
} else { \ |
*ret = false; \ |
@@ -870,7 +876,8 @@ TRACE_EVENT_API_CLASS_EXPORT extern \ |
#define INTERNAL_TRACE_EVENT_ADD(phase, category_group, name, flags, ...) \ |
do { \ |
INTERNAL_TRACE_EVENT_GET_CATEGORY_INFO(category_group); \ |
- if (*INTERNAL_TRACE_EVENT_UID(category_group_enabled)) { \ |
+ if (TRACE_EVENT_CATEGORY_GROUP_ENABLED_FOR_RECORDING_MODE( \ |
+ category_group_enabled)) { \ |
trace_event_internal::AddTraceEvent( \ |
phase, INTERNAL_TRACE_EVENT_UID(category_group_enabled), name, \ |
trace_event_internal::kNoEventId, flags, ##__VA_ARGS__); \ |
@@ -883,7 +890,8 @@ TRACE_EVENT_API_CLASS_EXPORT extern \ |
#define INTERNAL_TRACE_EVENT_ADD_SCOPED(category_group, name, ...) \ |
INTERNAL_TRACE_EVENT_GET_CATEGORY_INFO(category_group); \ |
trace_event_internal::ScopedTracer INTERNAL_TRACE_EVENT_UID(tracer); \ |
- if (*INTERNAL_TRACE_EVENT_UID(category_group_enabled)) { \ |
+ if (TRACE_EVENT_CATEGORY_GROUP_ENABLED_FOR_RECORDING_MODE( \ |
+ category_group_enabled)) { \ |
base::debug::TraceEventHandle h = trace_event_internal::AddTraceEvent( \ |
TRACE_EVENT_PHASE_COMPLETE, \ |
INTERNAL_TRACE_EVENT_UID(category_group_enabled), \ |
@@ -899,7 +907,8 @@ TRACE_EVENT_API_CLASS_EXPORT extern \ |
flags, ...) \ |
do { \ |
INTERNAL_TRACE_EVENT_GET_CATEGORY_INFO(category_group); \ |
- if (*INTERNAL_TRACE_EVENT_UID(category_group_enabled)) { \ |
+ if (TRACE_EVENT_CATEGORY_GROUP_ENABLED_FOR_RECORDING_MODE( \ |
+ category_group_enabled)) { \ |
unsigned char trace_event_flags = flags | TRACE_EVENT_FLAG_HAS_ID; \ |
trace_event_internal::TraceID trace_event_trace_id( \ |
id, &trace_event_flags); \ |
@@ -916,7 +925,8 @@ TRACE_EVENT_API_CLASS_EXPORT extern \ |
category_group, name, id, thread_id, timestamp, flags, ...) \ |
do { \ |
INTERNAL_TRACE_EVENT_GET_CATEGORY_INFO(category_group); \ |
- if (*INTERNAL_TRACE_EVENT_UID(category_group_enabled)) { \ |
+ if (TRACE_EVENT_CATEGORY_GROUP_ENABLED_FOR_RECORDING_MODE( \ |
+ category_group_enabled)) { \ |
unsigned char trace_event_flags = flags | TRACE_EVENT_FLAG_HAS_ID; \ |
trace_event_internal::TraceID trace_event_trace_id( \ |
id, &trace_event_flags); \ |