| 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 87dfd249862c1278f13a3728b9d94bdd1331dc62..c780cc857577cf7d39728f2285667e051bd6b83d 100644
|
| --- a/base/trace_event/common/trace_event_common.h
|
| +++ b/base/trace_event/common/trace_event_common.h
|
| @@ -308,8 +308,8 @@
|
| TRACE_EVENT_GET_SAMPLING_STATE_FOR_BUCKET(0)
|
| #define TRACE_EVENT_SET_SAMPLING_STATE(category, name) \
|
| TRACE_EVENT_SET_SAMPLING_STATE_FOR_BUCKET(0, category, name)
|
| -#define TRACE_EVENT_SET_NONCONST_SAMPLING_STATE(categoryAndName) \
|
| - TRACE_EVENT_SET_NONCONST_SAMPLING_STATE_FOR_BUCKET(0, categoryAndName)
|
| +#define TRACE_EVENT_SET_NONCONST_SAMPLING_STATE(category_and_name) \
|
| + TRACE_EVENT_SET_NONCONST_SAMPLING_STATE_FOR_BUCKET(0, category_and_name)
|
|
|
| // Records a single BEGIN event called "name" immediately, with 0, 1 or 2
|
| // associated arguments. If the category is not enabled, then this
|
| @@ -395,6 +395,11 @@
|
| TRACE_EVENT_FLAG_COPY, arg1_name, arg1_val, \
|
| arg2_name, arg2_val)
|
|
|
| +#define TRACE_EVENT_MARK_WITH_TIMESTAMP0(category_group, name, timestamp) \
|
| + INTERNAL_TRACE_EVENT_ADD_WITH_ID_TID_AND_TIMESTAMP( \
|
| + TRACE_EVENT_PHASE_MARK, category_group, name, 0, 0, timestamp, \
|
| + TRACE_EVENT_FLAG_NONE)
|
| +
|
| #define TRACE_EVENT_MARK_WITH_TIMESTAMP1(category_group, name, timestamp, \
|
| arg1_name, arg1_val) \
|
| INTERNAL_TRACE_EVENT_ADD_WITH_ID_TID_AND_TIMESTAMP( \
|
|
|