(reland) Adds TimeDomains to the TaskQueueManager

components/scheduler/base/task_queue_impl.cc

 // Copyright 2015 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 "components/scheduler/base/task_queue_impl.h"
 
+#include "components/scheduler/base/delayed_task_delegate.h"
 #include "components/scheduler/base/task_queue_manager.h"
 #include "components/scheduler/base/task_queue_manager_delegate.h"
 
 namespace scheduler {
 namespace internal {
 
 TaskQueueImpl::TaskQueueImpl(
     TaskQueueManager* task_queue_manager,
+    const scoped_refptr<DelayedTaskDelegate>& delayed_task_delegate,
     const Spec& spec,
     const char* disabled_by_default_tracing_category,
     const char* disabled_by_default_verbose_tracing_category)
     : thread_id_(base::PlatformThread::CurrentId()),
-      any_thread_(task_queue_manager, spec.pump_policy),
+      any_thread_(task_queue_manager, spec.pump_policy, delayed_task_delegate),
       name_(spec.name),
       disabled_by_default_tracing_category_(
           disabled_by_default_tracing_category),
       disabled_by_default_verbose_tracing_category_(
           disabled_by_default_verbose_tracing_category),
       main_thread_only_(task_queue_manager),
       wakeup_policy_(spec.wakeup_policy),
       should_monitor_quiescence_(spec.should_monitor_quiescence),
       should_notify_observers_(spec.should_notify_observers) {}
 
@@ skipping 16 matching lines @@
                           int sequence_number,
                           bool nestable)
     : PendingTask(posted_from, task, base::TimeTicks(), nestable),
 #ifndef NDEBUG
       enqueue_order_set_(false),
 #endif
       enqueue_order_(0) {
   sequence_num = sequence_number;
 }
 
-TaskQueueImpl::AnyThread::AnyThread(TaskQueueManager* task_queue_manager,
-                                    PumpPolicy pump_policy)
-    : task_queue_manager(task_queue_manager), pump_policy(pump_policy) {}
+TaskQueueImpl::AnyThread::AnyThread(
+    TaskQueueManager* task_queue_manager,
+    PumpPolicy pump_policy,
+    const scoped_refptr<DelayedTaskDelegate>& delayed_task_delegate)
+    : task_queue_manager(task_queue_manager),
+      pump_policy(pump_policy),
+      delayed_task_delegate(delayed_task_delegate) {}
 
 TaskQueueImpl::AnyThread::~AnyThread() {}
 
 TaskQueueImpl::MainThreadOnly::MainThreadOnly(
     TaskQueueManager* task_queue_manager)
     : task_queue_manager(task_queue_manager),
       set_index(0) {}
 
 TaskQueueImpl::MainThreadOnly::~MainThreadOnly() {}
 
 void TaskQueueImpl::UnregisterTaskQueue() {
   base::AutoLock lock(any_thread_lock_);
   if (!any_thread().task_queue_manager)
     return;
+
+  any_thread().delayed_task_delegate->CancelDelayedWork(this);
+  any_thread().delayed_task_delegate = scoped_refptr<DelayedTaskDelegate>();

[Sami, 2015/11/17 10:31:06]

nit: I think there's a release() or reset() for this.

[alex clarke (OOO till 29th), 2015/11/18 15:30:15]

I can't see anything like that on scoped_refptr

   any_thread().task_queue_manager->UnregisterTaskQueue(this);
 
   any_thread().task_queue_manager = nullptr;
   main_thread_only().task_queue_manager = nullptr;
   any_thread().delayed_task_queue = std::priority_queue<Task>();
   any_thread().incoming_queue = std::queue<Task>();
   main_thread_only().work_queue = std::queue<Task>();
 }
 
 bool TaskQueueImpl::RunsTasksOnCurrentThread() const {
@@ skipping 14 matching lines @@
   return PostDelayedTaskImpl(from_here, task, delay, TaskType::NON_NESTABLE);
 }
 
 bool TaskQueueImpl::PostDelayedTaskAt(
     const tracked_objects::Location& from_here,
     const base::Closure& task,
     base::TimeTicks desired_run_time) {
   base::AutoLock lock(any_thread_lock_);
   if (!any_thread().task_queue_manager)
     return false;
-  LazyNow lazy_now(any_thread().task_queue_manager->delegate().get());
-  return PostDelayedTaskLocked(&lazy_now, from_here, task, desired_run_time,
+  any_thread().delayed_task_delegate->InvalidateNowCache();
+  return PostDelayedTaskLocked(from_here, task, desired_run_time,
                                TaskType::NORMAL);
 }
 
 bool TaskQueueImpl::PostDelayedTaskImpl(
     const tracked_objects::Location& from_here,
     const base::Closure& task,
     base::TimeDelta delay,
     TaskType task_type) {
   base::AutoLock lock(any_thread_lock_);
   if (!any_thread().task_queue_manager)
     return false;
-  LazyNow lazy_now(any_thread().task_queue_manager->delegate().get());
   base::TimeTicks desired_run_time;
+  any_thread().delayed_task_delegate->InvalidateNowCache();
   if (delay > base::TimeDelta())
-    desired_run_time = lazy_now.Now() + delay;
-  return PostDelayedTaskLocked(&lazy_now, from_here, task, desired_run_time,
-                               task_type);
+    desired_run_time = any_thread().delayed_task_delegate->CachedNow() + delay;
+  return PostDelayedTaskLocked(from_here, task, desired_run_time, task_type);
 }
 
 bool TaskQueueImpl::PostDelayedTaskLocked(
-    LazyNow* lazy_now,
     const tracked_objects::Location& from_here,
     const base::Closure& task,
     base::TimeTicks desired_run_time,
     TaskType task_type) {
   DCHECK(any_thread().task_queue_manager);
   Task pending_task(from_here, task,
                     any_thread().task_queue_manager->GetNextSequenceNumber(),
                     task_type != TaskType::NON_NESTABLE);
   any_thread().task_queue_manager->DidQueueTask(pending_task);
 
   if (!desired_run_time.is_null()) {
-    pending_task.delayed_run_time = std::max(lazy_now->Now(), desired_run_time);
+    pending_task.delayed_run_time = std::max(
+        any_thread().delayed_task_delegate->CachedNow(), desired_run_time);
     // TODO(alexclarke): consider emplace() when C++11 library features allowed.
     any_thread().delayed_task_queue.push(pending_task);
     TraceQueueSize(true);
     // Schedule a later call to MoveReadyDelayedTasksToIncomingQueue.
-    any_thread().task_queue_manager->ScheduleDelayedWork(this, desired_run_time,
-                                                         lazy_now);
+    any_thread().delayed_task_delegate->ScheduleDelayedWork(this,
+                                                            desired_run_time);
     return true;
   }
   pending_task.set_enqueue_order(pending_task.sequence_num);
   EnqueueTaskLocked(pending_task);
   return true;
 }
 
-void TaskQueueImpl::MoveReadyDelayedTasksToIncomingQueue(LazyNow* lazy_now) {
+void TaskQueueImpl::MoveReadyDelayedTasksToIncomingQueue() {
   base::AutoLock lock(any_thread_lock_);
   if (!any_thread().task_queue_manager)
     return;
 
-  MoveReadyDelayedTasksToIncomingQueueLocked(lazy_now);
+  MoveReadyDelayedTasksToIncomingQueueLocked();
 }
 
-void TaskQueueImpl::MoveReadyDelayedTasksToIncomingQueueLocked(
-    LazyNow* lazy_now) {
+void TaskQueueImpl::MoveReadyDelayedTasksToIncomingQueueLocked() {
   // Enqueue all delayed tasks that should be running now.
   while (!any_thread().delayed_task_queue.empty() &&
          any_thread().delayed_task_queue.top().delayed_run_time <=
-             lazy_now->Now()) {
+             any_thread().delayed_task_delegate->CachedNow()) {
     // TODO(alexclarke): consider std::move() when allowed.
     EnqueueDelayedTaskLocked(any_thread().delayed_task_queue.top());
     any_thread().delayed_task_queue.pop();
   }
   TraceQueueSize(true);
 }
 
 bool TaskQueueImpl::IsQueueEnabled() const {
   if (!main_thread_only().task_queue_manager)
     return false;
@@ skipping 46 matching lines @@
 bool TaskQueueImpl::NextPendingDelayedTaskRunTime(
     base::TimeTicks* next_pending_delayed_task) {
   base::AutoLock lock(any_thread_lock_);
   if (any_thread().delayed_task_queue.empty())
     return false;
   *next_pending_delayed_task =
       any_thread().delayed_task_queue.top().delayed_run_time;
   return true;
 }
 
-void TaskQueueImpl::UpdateWorkQueue(LazyNow* lazy_now,
-                                    bool should_trigger_wakeup,
+void TaskQueueImpl::UpdateWorkQueue(bool should_trigger_wakeup,
                                     const Task* previous_task) {
   DCHECK(main_thread_only().work_queue.empty());
   base::AutoLock lock(any_thread_lock_);
   if (!ShouldAutoPumpQueueLocked(should_trigger_wakeup, previous_task))
     return;
-  MoveReadyDelayedTasksToIncomingQueueLocked(lazy_now);
+  MoveReadyDelayedTasksToIncomingQueueLocked();
   std::swap(main_thread_only().work_queue, any_thread().incoming_queue);
   // |any_thread().incoming_queue| is now empty so
   // TaskQueueManager::UpdateQueues no longer needs to consider
   // this queue for reloading.
   any_thread().task_queue_manager->UnregisterAsUpdatableTaskQueue(this);
   if (!main_thread_only().work_queue.empty()) {
     DCHECK(any_thread().task_queue_manager);
     any_thread().task_queue_manager->selector_.GetTaskQueueSets()->OnPushQueue(
         this);
     TraceQueueSize(true);
@@ skipping 62 matching lines @@
       any_thread().pump_policy != PumpPolicy::AUTO) {
     PumpQueueLocked();
   }
   any_thread().pump_policy = pump_policy;
 }
 
 void TaskQueueImpl::PumpQueueLocked() {
   if (!any_thread().task_queue_manager)
     return;
 
-  LazyNow lazy_now(any_thread().task_queue_manager->delegate().get());
-  MoveReadyDelayedTasksToIncomingQueueLocked(&lazy_now);
+  any_thread().delayed_task_delegate->InvalidateNowCache();
+  MoveReadyDelayedTasksToIncomingQueueLocked();
 
   bool was_empty = main_thread_only().work_queue.empty();
   while (!any_thread().incoming_queue.empty()) {
     // TODO(alexclarke): consider std::move() when allowed.
     main_thread_only().work_queue.push(any_thread().incoming_queue.front());
     any_thread().incoming_queue.pop();
   }
   // |incoming_queue| is now empty so TaskQueueManager::UpdateQueues no longer
   // needs to consider this queue for reloading.
   any_thread().task_queue_manager->UnregisterAsUpdatableTaskQueue(this);
@@ skipping 172 matching lines @@
   state->SetInteger("enqueue_order", task.enqueue_order());
   state->SetInteger("sequence_num", task.sequence_num);
   state->SetBoolean("nestable", task.nestable);
   state->SetBoolean("is_high_res", task.is_high_res);
   state->SetDouble(
       "delayed_run_time",
       (task.delayed_run_time - base::TimeTicks()).InMicroseconds() / 1000.0L);
   state->EndDictionary();
 }
 
+size_t TaskQueueImpl::IncommingQueueSizeForTest() const {
+  base::AutoLock lock(any_thread_lock_);
+  return any_thread().incoming_queue.size();
+}
+
 }  // namespace internal
 }  // namespace scheduler