TaskScheduler: Pop a Task from its Sequence from SchedulerWorkerThread.

base/task_scheduler/scheduler_worker_thread.cc

 // Copyright 2016 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 "base/task_scheduler/scheduler_worker_thread.h"
 
 #include <stddef.h>
 
 #include <utility>
 
@@ skipping 56 matching lines @@
   while (!task_tracker_->shutdown_completed() && !ShouldExitForTesting()) {
     // Get the sequence containing the next task to execute.
     scoped_refptr<Sequence> sequence = delegate_->GetWork(this);
 
     if (!sequence) {
       wake_up_event_.Wait();
       continue;
     }
 
     task_tracker_->RunTask(sequence->PeekTask());
-    delegate_->RanTaskFromSequence(std::move(sequence));
+
+    const bool sequence_became_empty = sequence->PopTask();
+
+    // If |sequence| isn't empty immediately after the pop, enqueue it to
+    // maintain the invariant that a non-empty Sequence is always referenced by
+    // either a PriorityQueue or a SchedulerWorkerThread. If it is empty, it
+    // will be enqueued when a Task is added to it.

[robliao, 2016/04/08 17:21:39]

Nit: Technically, for the empty case...
If it is empty and there are live references to it, it will be enqueued when a
Task is added to it. Otherwise, the sequence will be destroyed at the end of
this scope.

[fdoray, 2016/04/08 17:49:12]

Done.

+    if (!sequence_became_empty)
+      delegate_->EnqueueSequence(std::move(sequence));
 
     // Calling WakeUp() guarantees that this SchedulerWorkerThread will run
     // Tasks from Sequences returned by the GetWork() method of |delegate_|
     // until it returns nullptr. Resetting |wake_up_event_| here doesn't break
     // this invariant and avoids a useless loop iteration before going to sleep
     // if WakeUp() is called while this SchedulerWorkerThread is awake.
     wake_up_event_.Reset();
   }
 
   delegate_->OnMainExit();
 }
 
 bool SchedulerWorkerThread::ShouldExitForTesting() const {
   AutoSchedulerLock auto_lock(should_exit_for_testing_lock_);
   return should_exit_for_testing_;
 }
 
 }  // namespace internal
 }  // namespace base