Use TRACE_TASK_EXECUTION in SequencedWorkerPool.

base/threading/sequenced_worker_pool.cc

Index: base/threading/sequenced_worker_pool.cc
diff --git a/base/threading/sequenced_worker_pool.cc b/base/threading/sequenced_worker_pool.cc
index d856c3a70b7cbc9c2e0e20908de519b3d0d1ce97..2d473bf0fca602917115580e032a56c4b40e718d 100644
--- a/base/threading/sequenced_worker_pool.cc
+++ b/base/threading/sequenced_worker_pool.cc
@@ -35,7 +35,6 @@
 #include "base/threading/thread_restrictions.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/time/time.h"
-#include "base/trace_event/heap_profiler.h"
 #include "base/trace_event/trace_event.h"
 #include "base/tracked_objects.h"
 #include "base/tracking_info.h"
@@ -992,14 +991,11 @@ void SequencedWorkerPool::Inner::ThreadLoop(Worker* this_worker) {
       GetWorkStatus status =
           GetWork(&task, &wait_time, &delete_these_outside_lock);
       if (status == GET_WORK_FOUND) {
-        TRACE_EVENT_WITH_FLOW2(TRACE_DISABLED_BY_DEFAULT("toplevel.flow"),
-            "SequencedWorkerPool::Inner::ThreadLoop",
+        TRACE_TASK_EXECUTION("SequencedWorkerPool::Inner::ThreadLoop", task);

[danakj, 2016/10/20 21:05:18]

Is reordering these ok? They will not nest differently?

[fdoray, 2016/10/21 12:47:59]

Yes.

This new ordering is consistent with MessageLoop and TaskScheduler.

MessageLoop snippet:
https://cs.chromium.org/chromium/src/base/message_loop/message_loop.cc?sq=pac...

  // Note: This invokes TRACE_HEAP_PROFILER_API_SCOPED_TASK_EXECUTION.
  TRACE_TASK_EXECUTION("MessageLoop::RunTask", *pending_task);

  for (auto& observer : task_observers_)
    observer.WillProcessTask(*pending_task);
  // Note: RunTask invokes TRACE_EVENT_WITH_FLOW.
  task_annotator_.RunTask("MessageLoop::PostTask", pending_task);
  for (auto& observer : task_observers_)
    observer.DidProcessTask(*pending_task);

TaskScheduler snippet:
https://cs.chromium.org/chromium/src/base/task_scheduler/task_tracker.cc?sq=p...


  // Note: This invokes TRACE_HEAP_PROFILER_API_SCOPED_TASK_EXECUTION.
  TRACE_TASK_EXECUTION(kRunFunctionName, *task);

  ...    

  // Note: RunTask invokes TRACE_EVENT_WITH_FLOW.
  task_annotator.RunTask(kQueueFunctionName, task.get());

+        TRACE_EVENT_WITH_FLOW0(TRACE_DISABLED_BY_DEFAULT("toplevel.flow"),
+            "SequencedWorkerPool::Inner::PostTask",

[danakj, 2016/10/20 21:05:18]

This is ThreadLoop tho?

[fdoray, 2016/10/21 12:47:59]

No.

To be consistent with MessageLoop and TaskScheduler, the name of the post task
function must be used with the TRACE_EVENT_WITH_FLOW0 macro
https://cs.chromium.org/chromium/src/base/debug/task_annotator.cc?sq=package:...
and the name of the run task function must be used with the TRACE_TASK_EXECUTION
function (see previous comment in this file).

             TRACE_ID_MANGLE(GetTaskTraceID(task, static_cast<void*>(this))),
-            TRACE_EVENT_FLAG_FLOW_IN,
-            "src_file", task.posted_from.file_name(),
-            "src_func", task.posted_from.function_name());
-        TRACE_HEAP_PROFILER_API_SCOPED_TASK_EXECUTION task_event(

[gab, 2016/10/18 18:15:02]

Why was this removed?

[fdoray, 2016/10/18 19:19:29]

This is done by TRACE_TASK_EXECUTION
https://cs.chromium.org/chromium/src/base/trace_event/trace_event.h?l=394

-            task.posted_from.file_name());
+            TRACE_EVENT_FLAG_FLOW_IN);
         int new_thread_id = WillRunWorkerTask(task);
         {
           AutoUnlock unlock(lock_);