Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(54)

Side by Side Diff: base/test/scoped_task_scheduler.cc

Issue 2637843002: Migrate base::TaskRunner from Closure to OnceClosure (Closed)
Patch Set: rebase without dcheck_in_ref_count Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/test/scoped_task_scheduler.h" 5 #include "base/test/scoped_task_scheduler.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 25 matching lines...) Expand all
36 public: 36 public:
37 // |external_message_loop| is an externally provided MessageLoop on which to 37 // |external_message_loop| is an externally provided MessageLoop on which to
38 // run tasks. A MessageLoop will be created by TestTaskScheduler if 38 // run tasks. A MessageLoop will be created by TestTaskScheduler if
39 // |external_message_loop| is nullptr. 39 // |external_message_loop| is nullptr.
40 explicit TestTaskScheduler(MessageLoop* external_message_loop); 40 explicit TestTaskScheduler(MessageLoop* external_message_loop);
41 ~TestTaskScheduler() override; 41 ~TestTaskScheduler() override;
42 42
43 // TaskScheduler: 43 // TaskScheduler:
44 void PostDelayedTaskWithTraits(const tracked_objects::Location& from_here, 44 void PostDelayedTaskWithTraits(const tracked_objects::Location& from_here,
45 const TaskTraits& traits, 45 const TaskTraits& traits,
46 Closure task, 46 OnceClosure task,
47 TimeDelta delay) override; 47 TimeDelta delay) override;
48 scoped_refptr<TaskRunner> CreateTaskRunnerWithTraits( 48 scoped_refptr<TaskRunner> CreateTaskRunnerWithTraits(
49 const TaskTraits& traits) override; 49 const TaskTraits& traits) override;
50 scoped_refptr<SequencedTaskRunner> CreateSequencedTaskRunnerWithTraits( 50 scoped_refptr<SequencedTaskRunner> CreateSequencedTaskRunnerWithTraits(
51 const TaskTraits& traits) override; 51 const TaskTraits& traits) override;
52 scoped_refptr<SingleThreadTaskRunner> CreateSingleThreadTaskRunnerWithTraits( 52 scoped_refptr<SingleThreadTaskRunner> CreateSingleThreadTaskRunnerWithTraits(
53 const TaskTraits& traits) override; 53 const TaskTraits& traits) override;
54 std::vector<const HistogramBase*> GetHistograms() const override; 54 std::vector<const HistogramBase*> GetHistograms() const override;
55 int GetMaxConcurrentTasksWithTraitsDeprecated( 55 int GetMaxConcurrentTasksWithTraitsDeprecated(
56 const TaskTraits& traits) const override; 56 const TaskTraits& traits) const override;
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 }; 104 };
105 105
106 class TestTaskSchedulerTaskRunner : public SingleThreadTaskRunner { 106 class TestTaskSchedulerTaskRunner : public SingleThreadTaskRunner {
107 public: 107 public:
108 TestTaskSchedulerTaskRunner(TestTaskScheduler* task_scheduler, 108 TestTaskSchedulerTaskRunner(TestTaskScheduler* task_scheduler,
109 ExecutionMode execution_mode, 109 ExecutionMode execution_mode,
110 TaskTraits traits); 110 TaskTraits traits);
111 111
112 // SingleThreadTaskRunner: 112 // SingleThreadTaskRunner:
113 bool PostDelayedTask(const tracked_objects::Location& from_here, 113 bool PostDelayedTask(const tracked_objects::Location& from_here,
114 Closure closure, 114 OnceClosure closure,
115 TimeDelta delay) override; 115 TimeDelta delay) override;
116 bool PostNonNestableDelayedTask(const tracked_objects::Location& from_here, 116 bool PostNonNestableDelayedTask(const tracked_objects::Location& from_here,
117 Closure closure, 117 OnceClosure closure,
118 TimeDelta delay) override; 118 TimeDelta delay) override;
119 bool RunsTasksOnCurrentThread() const override; 119 bool RunsTasksOnCurrentThread() const override;
120 120
121 private: 121 private:
122 ~TestTaskSchedulerTaskRunner() override; 122 ~TestTaskSchedulerTaskRunner() override;
123 123
124 TestTaskScheduler* const task_scheduler_; 124 TestTaskScheduler* const task_scheduler_;
125 const ExecutionMode execution_mode_; 125 const ExecutionMode execution_mode_;
126 const SequenceToken sequence_token_; 126 const SequenceToken sequence_token_;
127 const TaskTraits traits_; 127 const TaskTraits traits_;
128 128
129 DISALLOW_COPY_AND_ASSIGN(TestTaskSchedulerTaskRunner); 129 DISALLOW_COPY_AND_ASSIGN(TestTaskSchedulerTaskRunner);
130 }; 130 };
131 131
132 TestTaskScheduler::TestTaskScheduler(MessageLoop* external_message_loop) 132 TestTaskScheduler::TestTaskScheduler(MessageLoop* external_message_loop)
133 : message_loop_owned_(external_message_loop ? nullptr 133 : message_loop_owned_(external_message_loop ? nullptr
134 : MakeUnique<MessageLoop>()), 134 : MakeUnique<MessageLoop>()),
135 message_loop_(message_loop_owned_ ? message_loop_owned_.get() 135 message_loop_(message_loop_owned_ ? message_loop_owned_.get()
136 : external_message_loop) {} 136 : external_message_loop) {}
137 137
138 TestTaskScheduler::~TestTaskScheduler() { 138 TestTaskScheduler::~TestTaskScheduler() {
139 // Shutdown if it hasn't already been done explicitly. 139 // Shutdown if it hasn't already been done explicitly.
140 if (!task_tracker_.HasShutdownStarted()) 140 if (!task_tracker_.HasShutdownStarted())
141 Shutdown(); 141 Shutdown();
142 } 142 }
143 143
144 void TestTaskScheduler::PostDelayedTaskWithTraits( 144 void TestTaskScheduler::PostDelayedTaskWithTraits(
145 const tracked_objects::Location& from_here, 145 const tracked_objects::Location& from_here,
146 const TaskTraits& traits, 146 const TaskTraits& traits,
147 Closure task, 147 OnceClosure task,
148 TimeDelta delay) { 148 TimeDelta delay) {
149 CreateTaskRunnerWithTraits(traits)->PostDelayedTask(from_here, 149 CreateTaskRunnerWithTraits(traits)->PostDelayedTask(from_here,
150 std::move(task), delay); 150 std::move(task), delay);
151 } 151 }
152 152
153 scoped_refptr<TaskRunner> TestTaskScheduler::CreateTaskRunnerWithTraits( 153 scoped_refptr<TaskRunner> TestTaskScheduler::CreateTaskRunnerWithTraits(
154 const TaskTraits& traits) { 154 const TaskTraits& traits) {
155 return make_scoped_refptr( 155 return make_scoped_refptr(
156 new TestTaskSchedulerTaskRunner(this, ExecutionMode::PARALLEL, traits)); 156 new TestTaskSchedulerTaskRunner(this, ExecutionMode::PARALLEL, traits));
157 } 157 }
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
241 TaskTraits traits) 241 TaskTraits traits)
242 : task_scheduler_(task_scheduler), 242 : task_scheduler_(task_scheduler),
243 execution_mode_(execution_mode), 243 execution_mode_(execution_mode),
244 sequence_token_(execution_mode == ExecutionMode::PARALLEL 244 sequence_token_(execution_mode == ExecutionMode::PARALLEL
245 ? SequenceToken() 245 ? SequenceToken()
246 : SequenceToken::Create()), 246 : SequenceToken::Create()),
247 traits_(traits) {} 247 traits_(traits) {}
248 248
249 bool TestTaskSchedulerTaskRunner::PostDelayedTask( 249 bool TestTaskSchedulerTaskRunner::PostDelayedTask(
250 const tracked_objects::Location& from_here, 250 const tracked_objects::Location& from_here,
251 Closure closure, 251 OnceClosure closure,
252 TimeDelta delay) { 252 TimeDelta delay) {
253 auto task = 253 auto task =
254 MakeUnique<internal::Task>(from_here, std::move(closure), traits_, delay); 254 MakeUnique<internal::Task>(from_here, std::move(closure), traits_, delay);
255 if (execution_mode_ == ExecutionMode::SEQUENCED) 255 if (execution_mode_ == ExecutionMode::SEQUENCED)
256 task->sequenced_task_runner_ref = make_scoped_refptr(this); 256 task->sequenced_task_runner_ref = make_scoped_refptr(this);
257 else if (execution_mode_ == ExecutionMode::SINGLE_THREADED) 257 else if (execution_mode_ == ExecutionMode::SINGLE_THREADED)
258 task->single_thread_task_runner_ref = make_scoped_refptr(this); 258 task->single_thread_task_runner_ref = make_scoped_refptr(this);
259 return task_scheduler_->PostTask(std::move(task), sequence_token_); 259 return task_scheduler_->PostTask(std::move(task), sequence_token_);
260 } 260 }
261 261
262 bool TestTaskSchedulerTaskRunner::PostNonNestableDelayedTask( 262 bool TestTaskSchedulerTaskRunner::PostNonNestableDelayedTask(
263 const tracked_objects::Location& from_here, 263 const tracked_objects::Location& from_here,
264 Closure closure, 264 OnceClosure closure,
265 TimeDelta delay) { 265 TimeDelta delay) {
266 // Tasks are never nested within the task scheduler. 266 // Tasks are never nested within the task scheduler.
267 return PostDelayedTask(from_here, std::move(closure), delay); 267 return PostDelayedTask(from_here, std::move(closure), delay);
268 } 268 }
269 269
270 bool TestTaskSchedulerTaskRunner::RunsTasksOnCurrentThread() const { 270 bool TestTaskSchedulerTaskRunner::RunsTasksOnCurrentThread() const {
271 if (execution_mode_ == ExecutionMode::PARALLEL) 271 if (execution_mode_ == ExecutionMode::PARALLEL)
272 return task_scheduler_->RunsTasksOnCurrentThread(); 272 return task_scheduler_->RunsTasksOnCurrentThread();
273 return sequence_token_ == SequenceToken::GetForCurrentThread(); 273 return sequence_token_ == SequenceToken::GetForCurrentThread();
274 } 274 }
(...skipping 15 matching lines...) Expand all
290 DCHECK_EQ(task_scheduler_, TaskScheduler::GetInstance()); 290 DCHECK_EQ(task_scheduler_, TaskScheduler::GetInstance());
291 291
292 // Per contract, call JoinForTesting() before deleting the TaskScheduler. 292 // Per contract, call JoinForTesting() before deleting the TaskScheduler.
293 TaskScheduler::GetInstance()->JoinForTesting(); 293 TaskScheduler::GetInstance()->JoinForTesting();
294 294
295 TaskScheduler::SetInstance(nullptr); 295 TaskScheduler::SetInstance(nullptr);
296 } 296 }
297 297
298 } // namespace test 298 } // namespace test
299 } // namespace base 299 } // namespace base
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698