[tracing] Move and rename TRACE_EVENT_API_TASK_EXECUTION_EVENT

base/trace_event/trace_event.h

Index: base/trace_event/trace_event.h
diff --git a/base/trace_event/trace_event.h b/base/trace_event/trace_event.h
index ef452f642f2ee7f419d0f213a77180a05accbc7d..7ffbc931e97ddf9f5b742688fcc77876ca36ec34 100644
--- a/base/trace_event/trace_event.h
+++ b/base/trace_event/trace_event.h
@@ -18,7 +18,7 @@
 #include "base/macros.h"
 #include "base/time/time.h"
 #include "base/trace_event/common/trace_event_common.h"
-#include "base/trace_event/heap_profiler_allocation_context_tracker.h"
+#include "base/trace_event/heap_profiler.h"  // For SCOPED_TASK_EXECUTION_EVENT

[Primiano Tucci (use gerrit), 2016/05/09 17:36:45]

Hmm this should go to base/trace_event/common/trace_event_common.h, not here
right?

[ssid, 2016/05/09 23:49:11]

trace_event_common.h cannot include any file form base since it is included in
other projects like v8. If any other projects want to use the TASK_EXEC api then
they should define SCOPED_TASK_EXECUTION_EVENT.

This is how trace_event currently works. Can you suggest better alternatives? Or
should i ask oysteine@?

[Primiano Tucci (use gerrit), 2016/05/10 16:03:53]

Oh you are right about trace_event_common.h
But this seems to  suggests that the entire TRACE_TASK_EXECUTION should be
defined in trace_event.h and not in common.h, As that macro can't be possibly
used outside of chrome..
And in turn trace_event.h should include heap_profiler.h
Right now you are adding an include which is not needed, but you put there just
because you know that this file is going to be pulled by trace_event_common.h
Let's just put both pieces in trace_event.h at this point.

 #include "base/trace_event/trace_event_system_stats_monitor.h"
 #include "base/trace_event/trace_log.h"
 #include "build/build_config.h"
@@ -211,10 +211,6 @@ TRACE_EVENT_API_CLASS_EXPORT extern \
 #define TRACE_EVENT_API_THREAD_BUCKET(thread_bucket)                           \
     g_trace_state[thread_bucket]
 
-// Scoped tracker for task execution context in the heap profiler.
-#define TRACE_EVENT_API_SCOPED_TASK_EXECUTION_EVENT \
-  trace_event_internal::ScopedTaskExecutionEvent
-
 ////////////////////////////////////////////////////////////////////////////////
 
 // Implementation detail: trace event macros create temporary variables
@@ -1050,31 +1046,6 @@ class TraceEventSamplingStateScope {
   const char* previous_state_;
 };
 
-// ScopedTaskExecutionEvent records the current task's context in the heap
-// profiler.
-class ScopedTaskExecutionEvent {
- public:
-  explicit ScopedTaskExecutionEvent(const char* task_context)
-      : context_(task_context) {
-    if (UNLIKELY(
-            base::trace_event::AllocationContextTracker::capture_enabled())) {
-      base::trace_event::AllocationContextTracker::GetInstanceForCurrentThread()
-          ->PushCurrentTaskContext(context_);
-    }
-  }
-
-  ~ScopedTaskExecutionEvent() {
-    if (UNLIKELY(
-            base::trace_event::AllocationContextTracker::capture_enabled())) {
-      base::trace_event::AllocationContextTracker::GetInstanceForCurrentThread()
-          ->PopCurrentTaskContext(context_);
-    }
-  }
-
- private:
-  const char* context_;
-};
-
 }  // namespace trace_event_internal
 
 namespace base {