Move and rename TaskTimeTracker to public interface exposed to WebThread, use in WebPerf Agent.

third_party/WebKit/Source/platform/scheduler/base/task_queue_manager.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "platform/scheduler/base/task_queue_manager.h"
 
 #include <queue>
 #include <set>
 
 #include "base/bind.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/trace_event/trace_event.h"
 #include "platform/scheduler/base/real_time_domain.h"
 #include "platform/scheduler/base/task_queue_impl.h"
 #include "platform/scheduler/base/task_queue_manager_delegate.h"
 #include "platform/scheduler/base/task_queue_selector.h"
-#include "platform/scheduler/base/task_time_tracker.h"
 #include "platform/scheduler/base/work_queue.h"
 #include "platform/scheduler/base/work_queue_sets.h"
 
 namespace blink {
 namespace scheduler {
 
 namespace {
 const size_t kRecordRecordTaskDelayHistogramsEveryNTasks = 10;
 
 void RecordDelayedTaskLateness(base::TimeDelta lateness) {
   UMA_HISTOGRAM_TIMES("RendererScheduler.TaskQueueManager.DelayedTaskLateness",
                       lateness);
 }
 
 void RecordImmediateTaskQueueingDuration(tracked_objects::Duration duration) {
   UMA_HISTOGRAM_TIMES(
       "RendererScheduler.TaskQueueManager.ImmediateTaskQueueingDuration",
       base::TimeDelta::FromMilliseconds(duration.InMilliseconds()));
 }
+
+double MonotonicTimeInSeconds(base::TimeTicks timeTicks) {

[caseq, 2016/08/22 18:48:49]

WTF::monotonicallyIncreasingTime()?

[panicker, 2016/08/22 23:14:14]

I'm trying to convert the provided timeTicks, not just seeking a time value

+  return (timeTicks.ToInternalValue() / static_cast<double>(
+      base::Time::kMicrosecondsPerSecond));
+}
 }
 
 TaskQueueManager::TaskQueueManager(
     scoped_refptr<TaskQueueManagerDelegate> delegate,
     const char* tracing_category,
     const char* disabled_by_default_tracing_category,
     const char* disabled_by_default_verbose_tracing_category)
     : real_time_domain_(new RealTimeDomain(tracing_category)),
       delegate_(delegate),
       task_was_run_on_quiescence_monitored_queue_(false),
       work_batch_size_(1),
       task_count_(0),
-      task_time_tracker_(nullptr),
       tracing_category_(tracing_category),
       disabled_by_default_tracing_category_(
           disabled_by_default_tracing_category),
       disabled_by_default_verbose_tracing_category_(
           disabled_by_default_verbose_tracing_category),
       currently_executing_task_queue_(nullptr),
       observer_(nullptr),
       deletion_sentinel_(new DeletionSentinel()),
       weak_factory_(this) {
   DCHECK(delegate->RunsTasksOnCurrentThread());
@@ skipping 130 matching lines @@
     base::AutoLock lock(other_thread_lock_);
     other_thread_pending_wakeups_.erase(run_time);
   }
 
   if (!delegate_->IsNested())
     queues_to_delete_.clear();
 
   LazyNow lazy_now(real_time_domain()->CreateLazyNow());
   base::TimeTicks task_start_time;
 
-  if (!delegate_->IsNested() && task_time_tracker_)
+  if (!delegate_->IsNested() && task_time_observers_.might_have_observers() > 0)
     task_start_time = lazy_now.Now();
 
   // Pass false and nullptr to UpdateWorkQueues here to prevent waking up a
   // pump-after-wakeup queue.
   UpdateWorkQueues(false, nullptr, lazy_now);
 
   internal::TaskQueueImpl::Task previous_task;
 
   for (int i = 0; i < work_batch_size_; i++) {
     internal::WorkQueue* work_queue;
     if (!SelectWorkQueueToService(&work_queue)) {
       break;
     }
 
     bool should_trigger_wakeup = work_queue->task_queue()->wakeup_policy() ==
                                  TaskQueue::WakeupPolicy::CAN_WAKE_OTHER_QUEUES;
 
-    switch (ProcessTaskFromWorkQueue(work_queue, &previous_task)) {
+
+    if (!delegate_->IsNested()) {
+        FOR_EACH_OBSERVER(WebThread::TaskTimeObserver, task_time_observers_,

[Sami, 2016/08/22 15:51:30]

(Indentation looks a little off -- git cl format should fix this)

[panicker, 2016/08/22 23:14:14]

Done.

+                          willProcessTask());
+    }
+    TaskQueueManager::ProcessTaskResult result = ProcessTaskFromWorkQueue(
+        work_queue, &previous_task);
+    if (!delegate_->IsNested()) {
+        FOR_EACH_OBSERVER(WebThread::TaskTimeObserver, task_time_observers_,

[caseq, 2016/08/22 18:48:49]

Have you considered moving this into ProcessTaskFromWorkQueue()? I don't think
we need any signals in case it bails out without running the task, and it will
also make this similar to other observers.

[panicker, 2016/08/22 23:14:14]

Addressed in new patch.
Sami had the same comment -- and it turns out that the additional set of
willProcess & didProcess wasn't strictly necessary.

+                          didProcessTask());
+    }
+
+    switch (result) {
       case ProcessTaskResult::DEFERRED:
         // If a task was deferred, try again with another task. Note that this
         // means deferred tasks (i.e. non-nestable tasks) will never trigger
         // queue wake-ups.
         continue;
       case ProcessTaskResult::EXECUTED:
         break;
       case ProcessTaskResult::TASK_QUEUE_MANAGER_DELETED:
         return;  // The TaskQueueManager got deleted, we must bail out.
     }
 
     lazy_now = real_time_domain()->CreateLazyNow();
-    if (!delegate_->IsNested() && task_time_tracker_) {
+    if (!delegate_->IsNested() && task_time_observers_.might_have_observers()) {
       // Only report top level task durations.
       base::TimeTicks task_end_time = lazy_now.Now();
-      task_time_tracker_->ReportTaskTime(task_start_time, task_end_time);
+      FOR_EACH_OBSERVER(
+          WebThread::TaskTimeObserver, task_time_observers_, reportTaskTime(
+              MonotonicTimeInSeconds(task_start_time),
+              MonotonicTimeInSeconds(task_end_time)));
       task_start_time = task_end_time;
     }
 
     work_queue = nullptr;  // The queue may have been unregistered.
 
     UpdateWorkQueues(should_trigger_wakeup, &previous_task, lazy_now);
 
     // Only run a single task per batch in nested run loops so that we can
     // properly exit the nested loop when someone calls RunLoop::Quit().
     if (delegate_->IsNested())
@@ skipping 122 matching lines @@
   DCHECK(main_thread_checker_.CalledOnValidThread());
   task_observers_.AddObserver(task_observer);
 }
 
 void TaskQueueManager::RemoveTaskObserver(
     base::MessageLoop::TaskObserver* task_observer) {
   DCHECK(main_thread_checker_.CalledOnValidThread());
   task_observers_.RemoveObserver(task_observer);
 }
 
+void TaskQueueManager::AddTaskTimeObserver(
+    WebThread::TaskTimeObserver* task_time_observer) {
+  DCHECK(main_thread_checker_.CalledOnValidThread());
+  task_time_observers_.AddObserver(task_time_observer);

[alph, 2016/08/22 22:21:27]

nit: You could also add it into task_observers_, so you don't need an extra code
that calls 'will...' and 'did...'

[panicker, 2016/08/22 23:14:14]

yep - done in new patch.

+}
+
+void TaskQueueManager::RemoveTaskTimeObserver(
+    WebThread::TaskTimeObserver* task_time_observer) {
+  DCHECK(main_thread_checker_.CalledOnValidThread());
+  task_time_observers_.RemoveObserver(task_time_observer);
+}
+
 bool TaskQueueManager::GetAndClearSystemIsQuiescentBit() {
   bool task_was_run = task_was_run_on_quiescence_monitored_queue_;
   task_was_run_on_quiescence_monitored_queue_ = false;
   return !task_was_run;
 }
 
 const scoped_refptr<TaskQueueManagerDelegate>& TaskQueueManager::delegate()
     const {
   return delegate_;
 }
@@ skipping 47 matching lines @@
   DCHECK(main_thread_checker_.CalledOnValidThread());
   DCHECK(!work_queue->Empty());
   if (observer_) {
     observer_->OnTriedToExecuteBlockedTask(*work_queue->task_queue(),
                                            *work_queue->GetFrontTask());
   }
 }
 
 }  // namespace scheduler
 }  // namespace blink