Remove after wakeup logic and replace PumpTask with Fences

third_party/WebKit/Source/platform/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 THIRD_PARTY_WEBKIT_SOURCE_PLATFORM_SCHEDULER_BASE_TASK_QUEUE_IMPL_H_
 #define THIRD_PARTY_WEBKIT_SOURCE_PLATFORM_SCHEDULER_BASE_TASK_QUEUE_IMPL_H_
 
 #include <stddef.h>
 
 #include <memory>
@@ skipping 131 matching lines @@
                                   base::TimeDelta delay) override;
   TaskHandle PostCancellableDelayedTask(
       const tracked_objects::Location& from_here,
       const base::Closure& task,
       base::TimeDelta delay) override;
   bool CancelTask(const TaskHandle& handle) override;
   void SetQueueEnabled(bool enabled) override;
   bool IsQueueEnabled() const override;
   bool IsEmpty() const override;
   bool HasPendingImmediateWork() const override;
-  bool NeedsPumping() const override;
   void SetQueuePriority(QueuePriority priority) override;
   QueuePriority GetQueuePriority() const override;
-  void PumpQueue(LazyNow* lazy_now, bool may_post_dowork) override;
-  void SetPumpPolicy(PumpPolicy pump_policy) override;
-  PumpPolicy GetPumpPolicy() const override;
   void AddTaskObserver(base::MessageLoop::TaskObserver* task_observer) override;
   void RemoveTaskObserver(
       base::MessageLoop::TaskObserver* task_observer) override;
   void SetTimeDomain(TimeDomain* time_domain) override;
   TimeDomain* GetTimeDomain() const override;
   void SetBlameContext(base::trace_event::BlameContext* blame_context) override;
+  void InsertFence() override;
+  void RemoveFence() override;
+  bool BlockedByFence() const override;
 
   bool IsTaskPending(const TaskHandle& handle) const;
 
-  void UpdateImmediateWorkQueue(bool should_trigger_wakeup,
-                                const Task* previous_task);
-  void UpdateDelayedWorkQueue(LazyNow* lazy_now,
-                              bool should_trigger_wakeup,
-                              const Task* previous_task);
-
-  WakeupPolicy wakeup_policy() const {
-    DCHECK(main_thread_checker_.CalledOnValidThread());
-    return wakeup_policy_;
-  }
+  void UpdateImmediateWorkQueue();
+  void UpdateDelayedWorkQueue(LazyNow* lazy_now);
 
   const char* GetName() const override;
 
   void AsValueInto(base::trace_event::TracedValue* state) const;
 
   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);
 
   // 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);
 
   WorkQueue* delayed_work_queue() {
     return main_thread_only().delayed_work_queue.get();
   }
 
   const WorkQueue* delayed_work_queue() const {
     return main_thread_only().delayed_work_queue.get();
   }
 
   WorkQueue* immediate_work_queue() {
     return main_thread_only().immediate_work_queue.get();
   }
 
   const WorkQueue* immediate_work_queue() const {
     return main_thread_only().immediate_work_queue.get();
   }
 
   bool should_report_when_execution_blocked() const {
     return should_report_when_execution_blocked_;
   }
 
  private:
   friend class WorkQueue;
+  friend class WorkQueueTest;
 
   // Note both DelayedRunTimeQueue and ComparatorQueue are sets for fast task
   // cancellation. Typically queue sizes are well under 200 so the overhead of
   // std::set vs std::priority_queue and std::queue is lost in the noise of
   // everything else.
   using DelayedRunTimeQueue = std::set<Task, Task::DelayedRunTimeComparator>;
   using ComparatorQueue = std::set<Task, Task::ComparatorFn>;
 
   enum class TaskType {
     NORMAL,
     NON_NESTABLE,
   };
 
   struct AnyThread {
     AnyThread(TaskQueueManager* task_queue_manager,
-              PumpPolicy pump_policy,
               TimeDomain* time_domain);
     ~AnyThread();
 
-    // TaskQueueManager, PumpPolicy and TimeDomain are maintained in two copies:
+    // TaskQueueManager and TimeDomain are maintained in two copies:
     // inside AnyThread and inside MainThreadOnly. They can be changed only from
     // main thread, so it should be locked before accessing from other threads.
     TaskQueueManager* task_queue_manager;
-    PumpPolicy pump_policy;
     TimeDomain* time_domain;
 
     ComparatorQueue immediate_incoming_queue;
   };
 
   struct MainThreadOnly {
     MainThreadOnly(TaskQueueManager* task_queue_manager,
-                   PumpPolicy pump_policy,
                    TaskQueueImpl* task_queue,
                    TimeDomain* time_domain);
     ~MainThreadOnly();
 
-    // Another copy of TaskQueueManager, PumpPolicy and TimeDomain for lock-free
-    // access from the main thread. See description inside struct AnyThread for
-    // details.
+    // Another copy of TaskQueueManager and TimeDomain for lock-free access from
+    // the main thread. See description inside struct AnyThread for details.
     TaskQueueManager* task_queue_manager;
-    PumpPolicy pump_policy;
     TimeDomain* time_domain;
 
     std::unique_ptr<WorkQueue> delayed_work_queue;
     std::unique_ptr<WorkQueue> immediate_work_queue;
     DelayedRunTimeQueue delayed_incoming_queue;
     base::ObserverList<base::MessageLoop::TaskObserver> task_observers;
     size_t set_index;
     bool is_enabled;
     base::trace_event::BlameContext* blame_context;  // Not owned.
+    EnqueueOrder current_fence;
   };
 
   ~TaskQueueImpl() override;
 
   bool PostImmediateTaskImpl(const tracked_objects::Location& from_here,
                              const base::Closure& task,
                              TaskType task_type);
   bool PostDelayedTaskImpl(const tracked_objects::Location& from_here,
                            const base::Closure& task,
                            base::TimeDelta delay,
                            TaskType task_type);
 
   // Push the task onto the |delayed_incoming_queue|. Lock-free main thread
   // only fast path.
   void PushOntoDelayedIncomingQueueFromMainThread(Task pending_task,
                                                   base::TimeTicks now);
 
   // Push the task onto the |delayed_incoming_queue|.  Slow path from other
   // threads.
   void PushOntoDelayedIncomingQueueLocked(Task pending_task);
 
   void ScheduleDelayedWorkTask(Task pending_task);
 
   // Enqueues any delayed tasks which should be run now on the
   // |delayed_work_queue|.  Must be called from the main thread.
   void MoveReadyDelayedTasksToDelayedWorkQueue(LazyNow* lazy_now);
 
   void MoveReadyImmediateTasksToImmediateWorkQueueLocked();
 
-  // Note this does nothing if its not called from the main thread.
-  void PumpQueueLocked(LazyNow* lazy_now, bool may_post_dowork);
-
-  // Returns true if |task| is older than the oldest incoming immediate task.
-  // NOTE |any_thread_lock_| must be locked.
-  bool TaskIsOlderThanQueuedImmediateTasksLocked(const Task* task);
-
-  // Returns true if |task| is older than the oldest delayed task.  Must be
-  // called from the main thread.
-  bool TaskIsOlderThanQueuedDelayedTasks(const Task* task);
-
-  // NOTE |any_thread_lock_| must be locked.
-  bool ShouldAutoPumpImmediateQueueLocked(bool should_trigger_wakeup,
-                                          const Task* previous_task);
-
-  //  Must be called from the main thread.
-  bool ShouldAutoPumpDelayedQueue(bool should_trigger_wakeup,
-                                  const Task* previous_task);
-
   // Push the task onto the |immediate_incoming_queue| and for auto pumped
   // queues it calls MaybePostDoWorkOnMainRunner if the Incoming queue was
   // empty.
   void PushOntoImmediateIncomingQueueLocked(Task pending_task);
 
+  // As BlockedByFence but safe to be called while locked.
+  bool BlockedByFenceLocked() const;
+
   void TraceQueueSize(bool is_locked) const;
   static void QueueAsValueInto(const ComparatorQueue& queue,
                                base::trace_event::TracedValue* state);
   static void QueueAsValueInto(const DelayedRunTimeQueue& queue,
                                base::trace_event::TracedValue* state);
   static void TaskAsValueInto(const Task& task,
                               base::trace_event::TracedValue* state);
 
   const base::PlatformThreadId thread_id_;
 
@@ skipping 16 matching lines @@
   MainThreadOnly main_thread_only_;
   MainThreadOnly& main_thread_only() {
     DCHECK(main_thread_checker_.CalledOnValidThread());
     return main_thread_only_;
   }
   const MainThreadOnly& main_thread_only() const {
     DCHECK(main_thread_checker_.CalledOnValidThread());
     return main_thread_only_;
   }
 
-  const WakeupPolicy wakeup_policy_;
   const bool should_monitor_quiescence_;
   const bool should_notify_observers_;
   const bool should_report_when_execution_blocked_;
 
   DISALLOW_COPY_AND_ASSIGN(TaskQueueImpl);
 };
 
 }  // namespace internal
 }  // namespace scheduler
 }  // namespace blink
 
 #endif  // THIRD_PARTY_WEBKIT_SOURCE_PLATFORM_SCHEDULER_BASE_TASK_QUEUE_IMPL_H_