(reland) Adds TimeDomains to the TaskQueueManager

components/scheduler/base/task_queue_impl.h

 // 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.
 
 #ifndef CONTENT_RENDERER_SCHEDULER_BASE_TASK_QUEUE_IMPL_H_
 #define CONTENT_RENDERER_SCHEDULER_BASE_TASK_QUEUE_IMPL_H_
 
 #include <set>
 
 #include "base/pending_task.h"
 #include "base/threading/thread_checker.h"
 #include "base/trace_event/trace_event.h"
 #include "base/trace_event/trace_event_argument.h"
-#include "components/scheduler/base/lazy_now.h"
 #include "components/scheduler/base/task_queue.h"
 #include "components/scheduler/scheduler_export.h"
 
 namespace scheduler {
+class DelayedTaskDelegate;
 class TaskQueueManager;
 
 namespace internal {
-
 class SCHEDULER_EXPORT TaskQueueImpl final : public TaskQueue {
  public:
   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);
 
   class SCHEDULER_EXPORT Task : public base::PendingTask {
    public:
     Task();
     Task(const tracked_objects::Location& posted_from,
          const base::Closure& task,
          int sequence_number,
@@ skipping 42 matching lines @@
   void SetQueuePriority(QueuePriority priority) override;
   void PumpQueue() override;
   void SetPumpPolicy(PumpPolicy pump_policy) override;
   void AddTaskObserver(base::MessageLoop::TaskObserver* task_observer) override;
   void RemoveTaskObserver(
       base::MessageLoop::TaskObserver* task_observer) override;
 
   bool NextPendingDelayedTaskRunTime(
       base::TimeTicks* next_pending_delayed_task);
 
-  void UpdateWorkQueue(LazyNow* lazy_now,
-                       bool should_trigger_wakeup,
-                       const Task* previous_task);
+  void UpdateWorkQueue(bool should_trigger_wakeup, const Task* previous_task);
   Task TakeTaskFromWorkQueue();
 
   std::queue<Task>& work_queue() { return main_thread_only().work_queue; }
 
   WakeupPolicy wakeup_policy() const {
     DCHECK(main_thread_checker_.CalledOnValidThread());
     return wakeup_policy_;
   }
 
   const char* GetName() const override;
@@ skipping 16 matching lines @@
   bool GetQuiescenceMonitored() const { return should_monitor_quiescence_; }
   bool GetShouldNotifyObservers() const {
     return should_notify_observers_;
   }
 
   void NotifyWillProcessTask(const base::PendingTask& pending_task);
   void NotifyDidProcessTask(const base::PendingTask& pending_task);
 
   // Delayed task posted to the underlying run loop, which locks
   // |any_thread_lock_| and calls MoveReadyDelayedTasksToIncomingQueueLocked to
-  // process dealyed tasks
-  // that need to be run now.  Thread safe, but in practice it's always called
-  // from the main thread.
-  void MoveReadyDelayedTasksToIncomingQueue(LazyNow* lazy_now);
+  // process dealyed tasks that need to be run now.  Thread safe, but in
+  // practice it's always called from the main thread.
+  void MoveReadyDelayedTasksToIncomingQueue();
 
   // Test support functions.  These should not be used in production code.
   void PushTaskOntoWorkQueueForTest(const Task& task);
   void PopTaskFromWorkQueueForTest();
   size_t WorkQueueSizeForTest() const {
     return main_thread_only().work_queue.size();
   }
+  size_t IncommingQueueSizeForTest() const;

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

typo: incoming

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

Done.

 
   // Can be called on any thread.
   static const char* PumpPolicyToString(TaskQueue::PumpPolicy pump_policy);
 
   // Can be called on any thread.
   static const char* WakeupPolicyToString(
       TaskQueue::WakeupPolicy wakeup_policy);
 
   // Can be called on any thread.
   static const char* PriorityToString(TaskQueue::QueuePriority priority);
 
  private:
   enum class TaskType {
     NORMAL,
     NON_NESTABLE,
   };
 
   struct AnyThread {
-    AnyThread(TaskQueueManager* task_queue_manager, PumpPolicy pump_policy);
+    AnyThread(TaskQueueManager* task_queue_manager,
+              PumpPolicy pump_policy,
+              const scoped_refptr<DelayedTaskDelegate>& delayed_task_delegate);
     ~AnyThread();
 
     // TaskQueueManager is maintained in two copies: inside AnyThread and inside
     // MainThreadOnly. It can be changed only from main thread, so it should be
     // locked before accessing from other threads.
     TaskQueueManager* task_queue_manager;
 
     std::queue<Task> incoming_queue;
     PumpPolicy pump_policy;
     std::priority_queue<Task> delayed_task_queue;
+    scoped_refptr<DelayedTaskDelegate> delayed_task_delegate;
   };
 
   struct MainThreadOnly {
     explicit MainThreadOnly(TaskQueueManager* task_queue_manager);
     ~MainThreadOnly();
 
     // Another copy of TaskQueueManager for lock-free access from the main
     // thread. See description inside struct AnyThread for details.
     TaskQueueManager* task_queue_manager;
 
     std::queue<Task> work_queue;
     base::ObserverList<base::MessageLoop::TaskObserver> task_observers;
     size_t set_index;
   };
 
   ~TaskQueueImpl() override;
 
   bool PostDelayedTaskImpl(const tracked_objects::Location& from_here,
                            const base::Closure& task,
                            base::TimeDelta delay,
                            TaskType task_type);
-  bool PostDelayedTaskLocked(LazyNow* lazy_now,
-                             const tracked_objects::Location& from_here,
+  bool PostDelayedTaskLocked(const tracked_objects::Location& from_here,
                              const base::Closure& task,
                              base::TimeTicks desired_run_time,
                              TaskType task_type);
 
-  // Enqueues any delayed tasks which should be run now on the incoming_queue_
-  // and calls ScheduleDelayedWorkLocked to ensure future tasks are scheduled.
+  // Enqueues any delayed tasks which should be run now on the incoming_queue_.
   // Must be called with |any_thread_lock_| locked.
-  void MoveReadyDelayedTasksToIncomingQueueLocked(LazyNow* lazy_now);
+  void MoveReadyDelayedTasksToIncomingQueueLocked();
 
   void PumpQueueLocked();
   bool TaskIsOlderThanQueuedTasks(const Task* task);
   bool ShouldAutoPumpQueueLocked(bool should_trigger_wakeup,
                                  const Task* previous_task);
 
   // Push the task onto the |incoming_queue_| and for auto pumped queues it
   // calls MaybePostDoWorkOnMainRunner if the incomming queue was empty.
   void EnqueueTaskLocked(const Task& pending_task);
 
@@ skipping 42 matching lines @@
   const bool should_monitor_quiescence_;
   const bool should_notify_observers_;
 
   DISALLOW_COPY_AND_ASSIGN(TaskQueueImpl);
 };
 
 }  // namespace internal
 }  // namespace scheduler
 
 #endif  // CONTENT_RENDERER_SCHEDULER_BASE_TASK_QUEUE_IMPL_H_