OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "base/task_scheduler/utils.h" | 5 #include "base/task_scheduler/utils.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/callback.h" | 9 #include "base/callback.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
11 #include "base/memory/ptr_util.h" | 11 #include "base/memory/ptr_util.h" |
| 12 #include "base/task_scheduler/delayed_task_manager.h" |
12 #include "base/task_scheduler/priority_queue.h" | 13 #include "base/task_scheduler/priority_queue.h" |
13 #include "base/task_scheduler/scheduler_task_executor.h" | 14 #include "base/task_scheduler/scheduler_task_executor.h" |
14 #include "base/task_scheduler/sequence_sort_key.h" | 15 #include "base/task_scheduler/sequence_sort_key.h" |
15 #include "base/task_scheduler/task_tracker.h" | 16 #include "base/task_scheduler/task_tracker.h" |
16 #include "base/time/time.h" | 17 #include "base/time/time.h" |
17 | 18 |
18 namespace base { | 19 namespace base { |
19 namespace internal { | 20 namespace internal { |
20 | 21 |
21 bool PostTaskToExecutor(const tracked_objects::Location& posted_from, | 22 bool PostTaskToExecutor(const tracked_objects::Location& posted_from, |
22 const Closure& closure, | 23 const Closure& closure, |
23 const TaskTraits& traits, | 24 const TaskTraits& traits, |
24 const TimeDelta& delay, | 25 const TimeDelta& delay, |
25 scoped_refptr<Sequence> sequence, | 26 scoped_refptr<Sequence> sequence, |
26 SchedulerTaskExecutor* executor, | 27 SchedulerTaskExecutor* executor, |
27 TaskTracker* task_tracker) { | 28 TaskTracker* task_tracker, |
| 29 DelayedTaskManager* delayed_task_manager) { |
28 DCHECK(!closure.is_null()); | 30 DCHECK(!closure.is_null()); |
29 DCHECK(sequence); | 31 DCHECK(sequence); |
30 DCHECK(executor); | 32 DCHECK(executor); |
31 DCHECK(task_tracker); | 33 DCHECK(task_tracker); |
| 34 DCHECK(delayed_task_manager); |
32 | 35 |
33 // TODO(fdoray): Support delayed tasks. | 36 const TimeTicks delayed_run_time = |
34 DCHECK(delay.is_zero()); | 37 delay.is_zero() ? TimeTicks() : TimeTicks::Now() + delay; |
35 | |
36 std::unique_ptr<Task> task( | 38 std::unique_ptr<Task> task( |
37 new Task(posted_from, closure, traits, TimeTicks())); | 39 new Task(posted_from, closure, traits, delayed_run_time)); |
38 | 40 |
39 if (!task_tracker->WillPostTask(task.get())) | 41 if (!task_tracker->WillPostTask(task.get())) |
40 return false; | 42 return false; |
41 | 43 |
42 executor->PostTaskWithSequence(std::move(task), std::move(sequence)); | 44 if (delay.is_zero()) { |
| 45 executor->PostTaskWithSequence(std::move(task), std::move(sequence)); |
| 46 } else { |
| 47 delayed_task_manager->AddDelayedTask(std::move(task), std::move(sequence), |
| 48 executor); |
| 49 } |
| 50 |
43 return true; | 51 return true; |
44 } | 52 } |
45 | 53 |
46 bool AddTaskToSequenceAndPriorityQueue(std::unique_ptr<Task> task, | 54 bool AddTaskToSequenceAndPriorityQueue(std::unique_ptr<Task> task, |
47 scoped_refptr<Sequence> sequence, | 55 scoped_refptr<Sequence> sequence, |
48 PriorityQueue* priority_queue) { | 56 PriorityQueue* priority_queue) { |
49 DCHECK(task); | 57 DCHECK(task); |
50 DCHECK(sequence); | 58 DCHECK(sequence); |
51 DCHECK(priority_queue); | 59 DCHECK(priority_queue); |
52 | 60 |
(...skipping 13 matching lines...) Expand all Loading... |
66 priority_queue->BeginTransaction()->Push( | 74 priority_queue->BeginTransaction()->Push( |
67 WrapUnique(new PriorityQueue::SequenceAndSortKey(std::move(sequence), | 75 WrapUnique(new PriorityQueue::SequenceAndSortKey(std::move(sequence), |
68 sequence_sort_key))); | 76 sequence_sort_key))); |
69 } | 77 } |
70 | 78 |
71 return sequence_was_empty; | 79 return sequence_was_empty; |
72 } | 80 } |
73 | 81 |
74 } // namespace internal | 82 } // namespace internal |
75 } // namespace base | 83 } // namespace base |
OLD | NEW |