| Index: base/trace_event/trace_event.h
|
| diff --git a/base/trace_event/trace_event.h b/base/trace_event/trace_event.h
|
| index 1bf9429a180f16d88bdf7d234359f086825bf8db..e0249f5539a181175127ba4df1cc7fc489328f44 100644
|
| --- a/base/trace_event/trace_event.h
|
| +++ b/base/trace_event/trace_event.h
|
| @@ -144,11 +144,11 @@
|
| // class MyData : public base::trace_event::ConvertableToTraceFormat {
|
| // public:
|
| // MyData() {}
|
| -// virtual void AppendAsTraceFormat(std::string* out) const override {
|
| +// void AppendAsTraceFormat(std::string* out) const override {
|
| // out->append("{\"foo\":1}");
|
| // }
|
| // private:
|
| -// virtual ~MyData() {}
|
| +// ~MyData() override {}
|
| // DISALLOW_COPY_AND_ASSIGN(MyData);
|
| // };
|
| //
|
| @@ -601,6 +601,12 @@
|
| TRACE_EVENT_PHASE_ASYNC_BEGIN, category_group, name, id, \
|
| static_cast<int>(base::PlatformThread::CurrentId()), \
|
| timestamp, TRACE_EVENT_FLAG_NONE)
|
| +#define TRACE_EVENT_COPY_ASYNC_BEGIN_WITH_TIMESTAMP0(category_group, \
|
| + name, id, timestamp) \
|
| + INTERNAL_TRACE_EVENT_ADD_WITH_ID_TID_AND_TIMESTAMP( \
|
| + TRACE_EVENT_PHASE_ASYNC_BEGIN, category_group, name, id, \
|
| + static_cast<int>(base::PlatformThread::CurrentId()), \
|
| + timestamp, TRACE_EVENT_FLAG_COPY)
|
|
|
| // Records a single ASYNC_STEP_INTO event for |step| immediately. If the
|
| // category is not enabled, then this does nothing. The |name| and |id| must
|
| @@ -828,9 +834,10 @@
|
| category_group, name, TRACE_ID_DONT_MANGLE(id), TRACE_EVENT_FLAG_NONE)
|
|
|
| #define INTERNAL_TRACE_EVENT_CATEGORY_GROUP_ENABLED_FOR_RECORDING_MODE() \
|
| - UNLIKELY(*INTERNAL_TRACE_EVENT_UID(category_group_enabled) & \
|
| - (base::trace_event::TraceLog::ENABLED_FOR_RECORDING | \
|
| - base::trace_event::TraceLog::ENABLED_FOR_EVENT_CALLBACK))
|
| + UNLIKELY(*INTERNAL_TRACE_EVENT_UID(category_group_enabled) & \
|
| + (base::trace_event::TraceLog::ENABLED_FOR_RECORDING | \
|
| + base::trace_event::TraceLog::ENABLED_FOR_EVENT_CALLBACK | \
|
| + base::trace_event::TraceLog::ENABLED_FOR_ETW_EXPORT))
|
|
|
| // Macro to efficiently determine if a given category group is enabled.
|
| #define TRACE_EVENT_CATEGORY_GROUP_ENABLED(category_group, ret) \
|
|
|