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); |
32 | 34 DCHECK(delayed_task_manager); |
33 // TODO(fdoray): Support delayed tasks. | |
34 DCHECK(delay.is_zero()); | |
35 | 35 |
36 std::unique_ptr<Task> task(new Task(posted_from, closure, traits)); | 36 std::unique_ptr<Task> task(new Task(posted_from, closure, traits)); |
gab
2016/04/15 15:39:10
TrackingInfo (Task's subsubclass) has a constructo
fdoray
2016/04/15 17:41:47
Done. Related CL: https://codereview.chromium.org/
| |
37 if (!delay.is_zero()) | |
38 task->delayed_run_time = TimeTicks::Now() + delay; | |
37 | 39 |
38 if (!task_tracker->WillPostTask(task.get())) | 40 if (!task_tracker->WillPostTask(task.get())) |
39 return false; | 41 return false; |
40 | 42 |
41 executor->PostTaskWithSequence(std::move(task), std::move(sequence)); | 43 if (delay.is_zero()) { |
44 executor->PostTaskWithSequence(std::move(task), std::move(sequence)); | |
45 } else { | |
46 delayed_task_manager->AddDelayedTask(std::move(task), std::move(sequence), | |
47 executor); | |
48 } | |
49 | |
42 return true; | 50 return true; |
43 } | 51 } |
44 | 52 |
45 bool AddTaskToSequenceAndPriorityQueue(std::unique_ptr<Task> task, | 53 bool AddTaskToSequenceAndPriorityQueue(std::unique_ptr<Task> task, |
46 scoped_refptr<Sequence> sequence, | 54 scoped_refptr<Sequence> sequence, |
47 PriorityQueue* priority_queue) { | 55 PriorityQueue* priority_queue) { |
48 DCHECK(task); | 56 DCHECK(task); |
49 DCHECK(sequence); | 57 DCHECK(sequence); |
50 DCHECK(priority_queue); | 58 DCHECK(priority_queue); |
51 | 59 |
(...skipping 13 matching lines...) Expand all Loading... | |
65 priority_queue->BeginTransaction()->Push( | 73 priority_queue->BeginTransaction()->Push( |
66 WrapUnique(new PriorityQueue::SequenceAndSortKey(std::move(sequence), | 74 WrapUnique(new PriorityQueue::SequenceAndSortKey(std::move(sequence), |
67 sequence_sort_key))); | 75 sequence_sort_key))); |
68 } | 76 } |
69 | 77 |
70 return sequence_was_empty; | 78 return sequence_was_empty; |
71 } | 79 } |
72 | 80 |
73 } // namespace internal | 81 } // namespace internal |
74 } // namespace base | 82 } // namespace base |
OLD | NEW |