Move throttling of background timers into the renderer scheduler

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/task_queue_manager.h"
 #include "components/scheduler/base/task_queue_manager_delegate.h"
 #include "components/scheduler/base/time_domain.h"
 
 namespace scheduler {
 namespace internal {
 
 TaskQueueImpl::TaskQueueImpl(
     TaskQueueManager* task_queue_manager,
-    const scoped_refptr<TimeDomain>& time_domain,
+    TimeDomain* time_domain,
     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, time_domain),
       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) {
-  DCHECK(time_domain.get());
+  DCHECK(time_domain);
+  time_domain->RegisterQueue(this);
 }
 
 TaskQueueImpl::~TaskQueueImpl() {}

[Sami, 2015/11/26 19:27:50]

nit: DCHECK that we no longer have a time domain? (or do we need to unregister?)

[alex clarke (OOO till 29th), 2015/11/27 10:01:59]

I added a de-register here too.  It was needed in some of the tests.

 
 TaskQueueImpl::Task::Task()
     : PendingTask(tracked_objects::Location(),
                   base::Closure(),
                   base::TimeTicks(),
                   true),
 #ifndef NDEBUG
       enqueue_order_set_(false),
 #endif
       enqueue_order_(0) {
   sequence_num = 0;
 }
 
 TaskQueueImpl::Task::Task(const tracked_objects::Location& posted_from,
                           const base::Closure& task,
                           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,
-    const scoped_refptr<TimeDomain>& time_domain)
+TaskQueueImpl::AnyThread::AnyThread(TaskQueueManager* task_queue_manager,
+                                    PumpPolicy pump_policy,
+                                    TimeDomain* time_domain)
     : task_queue_manager(task_queue_manager),
       pump_policy(pump_policy),
       time_domain(time_domain) {}
 
 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().time_domain->UnregisterQueue(this);
+  if (any_thread().time_domain)
+    any_thread().time_domain->UnregisterQueue(this);
   any_thread().time_domain = nullptr;
   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 {
   base::AutoLock lock(any_thread_lock_);
   return base::PlatformThread::CurrentId() == thread_id_;
 }
 
 bool TaskQueueImpl::PostDelayedTask(const tracked_objects::Location& from_here,
                                     const base::Closure& task,
                                     base::TimeDelta delay) {
   return PostDelayedTaskImpl(from_here, task, delay, TaskType::NORMAL);
 }
 
 bool TaskQueueImpl::PostNonNestableDelayedTask(
     const tracked_objects::Location& from_here,
     const base::Closure& task,
     base::TimeDelta delay) {
   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().time_domain->CreateLazyNow());
-  return PostDelayedTaskLocked(&lazy_now, 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().time_domain->CreateLazyNow());
   base::TimeTicks desired_run_time;
@@ skipping 37 matching lines @@
       any_thread().task_queue_manager->DidQueueTask(thread_hop_task);
       EnqueueTaskLocked(thread_hop_task);
     }
     return true;
   }
   pending_task.set_enqueue_order(pending_task.sequence_num);
   EnqueueTaskLocked(pending_task);
   return true;
 }
 
-void TaskQueueImpl::ScheduleDelayedWorkTask(
-    const scoped_refptr<TimeDomain> time_domain,
-    base::TimeTicks desired_run_time) {
+void TaskQueueImpl::ScheduleDelayedWorkTask(TimeDomain* time_domain,
+                                            base::TimeTicks desired_run_time) {
   DCHECK(main_thread_checker_.CalledOnValidThread());
   LazyNow lazy_now(time_domain->CreateLazyNow());
   time_domain->ScheduleDelayedWork(this, desired_run_time, &lazy_now);
 }
 
 void TaskQueueImpl::MoveReadyDelayedTasksToIncomingQueue(LazyNow* lazy_now) {
   base::AutoLock lock(any_thread_lock_);
   if (!any_thread().task_queue_manager)
     return;
 
@@ skipping 20 matching lines @@
   return main_thread_only().task_queue_manager->selector_.IsQueueEnabled(this);
 }
 
 TaskQueue::QueueState TaskQueueImpl::GetQueueState() const {
   if (!main_thread_only().work_queue.empty())
     return QueueState::HAS_WORK;
 
   {
     base::AutoLock lock(any_thread_lock_);
     if (any_thread().incoming_queue.empty()) {
-      return QueueState::EMPTY;
+      if (any_thread().delayed_task_queue.empty())
+        return QueueState::EMPTY;
+      else
+        return QueueState::NO_IMMEDIATE_WORK;
     } else {
       return QueueState::NEEDS_PUMPING;
     }
   }
 }
-

[Sami, 2015/11/26 19:27:50]

Intentional?

[alex clarke (OOO till 29th), 2015/11/27 10:01:59]

Done.

 bool TaskQueueImpl::TaskIsOlderThanQueuedTasks(const Task* task) {
   // A null task is passed when UpdateQueue is called before any task is run.
   // In this case we don't want to pump an after_wakeup queue, so return true
   // here.
   if (!task)
     return true;
 
   // Return false if there are no task in the incoming queue.
   if (any_thread().incoming_queue.empty())
     return false;
@@ skipping 259 matching lines @@
 }
 
 void TaskQueueImpl::NotifyDidProcessTask(
     const base::PendingTask& pending_task) {
   DCHECK(should_notify_observers_);
   FOR_EACH_OBSERVER(base::MessageLoop::TaskObserver,
                     main_thread_only().task_observers,
                     DidProcessTask(pending_task));
 }
 
-void TaskQueueImpl::SetTimeDomain(
-    const scoped_refptr<TimeDomain>& time_domain) {
+void TaskQueueImpl::SetTimeDomain(TimeDomain* time_domain) {
   base::AutoLock lock(any_thread_lock_);
   DCHECK(main_thread_checker_.CalledOnValidThread());
   if (time_domain == any_thread().time_domain)
     return;
 
-  any_thread().time_domain->MigrateQueue(this, time_domain.get());
+  if (time_domain)
+    any_thread().time_domain->MigrateQueue(this, time_domain);
   any_thread().time_domain = time_domain;
 }
 
 // static
 void TaskQueueImpl::QueueAsValueInto(const std::queue<Task>& queue,
                                      base::trace_event::TracedValue* state) {
   std::queue<Task> queue_copy(queue);
   while (!queue_copy.empty()) {
     TaskAsValueInto(queue_copy.front(), state);
     queue_copy.pop();
@@ skipping 25 matching lines @@
   state->EndDictionary();
 }
 
 size_t TaskQueueImpl::IncomingQueueSizeForTest() const {
   base::AutoLock lock(any_thread_lock_);
   return any_thread().incoming_queue.size();
 }
 
 }  // namespace internal
 }  // namespace scheduler