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

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

Issue 2637843002: Migrate base::TaskRunner from Closure to OnceClosure (Closed)
Patch Set: rebase 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
« no previous file with comments | « base/test/null_task_runner.cc ('k') | base/test/test_mock_time_task_runner.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 public: 42 public:
43 // |external_message_loop| is an externally provided MessageLoop on which to 43 // |external_message_loop| is an externally provided MessageLoop on which to
44 // run tasks. A MessageLoop will be created by TestTaskScheduler if 44 // run tasks. A MessageLoop will be created by TestTaskScheduler if
45 // |external_message_loop| is nullptr. 45 // |external_message_loop| is nullptr.
46 explicit TestTaskScheduler(MessageLoop* external_message_loop); 46 explicit TestTaskScheduler(MessageLoop* external_message_loop);
47 ~TestTaskScheduler() override; 47 ~TestTaskScheduler() override;
48 48
49 // TaskScheduler: 49 // TaskScheduler:
50 void PostDelayedTaskWithTraits(const tracked_objects::Location& from_here, 50 void PostDelayedTaskWithTraits(const tracked_objects::Location& from_here,
51 const TaskTraits& traits, 51 const TaskTraits& traits,
52 Closure task, 52 OnceClosure task,
53 TimeDelta delay) override; 53 TimeDelta delay) override;
54 scoped_refptr<TaskRunner> CreateTaskRunnerWithTraits( 54 scoped_refptr<TaskRunner> CreateTaskRunnerWithTraits(
55 const TaskTraits& traits) override; 55 const TaskTraits& traits) override;
56 scoped_refptr<SequencedTaskRunner> CreateSequencedTaskRunnerWithTraits( 56 scoped_refptr<SequencedTaskRunner> CreateSequencedTaskRunnerWithTraits(
57 const TaskTraits& traits) override; 57 const TaskTraits& traits) override;
58 scoped_refptr<SingleThreadTaskRunner> CreateSingleThreadTaskRunnerWithTraits( 58 scoped_refptr<SingleThreadTaskRunner> CreateSingleThreadTaskRunnerWithTraits(
59 const TaskTraits& traits) override; 59 const TaskTraits& traits) override;
60 #if defined(OS_WIN) 60 #if defined(OS_WIN)
61 scoped_refptr<SingleThreadTaskRunner> CreateCOMSTATaskRunnerWithTraits( 61 scoped_refptr<SingleThreadTaskRunner> CreateCOMSTATaskRunnerWithTraits(
62 const TaskTraits& traits) override; 62 const TaskTraits& traits) override;
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 }; 127 };
128 128
129 class TestTaskSchedulerTaskRunner : public SingleThreadTaskRunner { 129 class TestTaskSchedulerTaskRunner : public SingleThreadTaskRunner {
130 public: 130 public:
131 TestTaskSchedulerTaskRunner(TestTaskScheduler* task_scheduler, 131 TestTaskSchedulerTaskRunner(TestTaskScheduler* task_scheduler,
132 ExecutionMode execution_mode, 132 ExecutionMode execution_mode,
133 TaskTraits traits); 133 TaskTraits traits);
134 134
135 // SingleThreadTaskRunner: 135 // SingleThreadTaskRunner:
136 bool PostDelayedTask(const tracked_objects::Location& from_here, 136 bool PostDelayedTask(const tracked_objects::Location& from_here,
137 Closure closure, 137 OnceClosure closure,
138 TimeDelta delay) override; 138 TimeDelta delay) override;
139 bool PostNonNestableDelayedTask(const tracked_objects::Location& from_here, 139 bool PostNonNestableDelayedTask(const tracked_objects::Location& from_here,
140 Closure closure, 140 OnceClosure closure,
141 TimeDelta delay) override; 141 TimeDelta delay) override;
142 bool RunsTasksOnCurrentThread() const override; 142 bool RunsTasksOnCurrentThread() const override;
143 143
144 private: 144 private:
145 ~TestTaskSchedulerTaskRunner() override; 145 ~TestTaskSchedulerTaskRunner() override;
146 146
147 TestTaskScheduler* const task_scheduler_; 147 TestTaskScheduler* const task_scheduler_;
148 const ExecutionMode execution_mode_; 148 const ExecutionMode execution_mode_;
149 const SequenceToken sequence_token_; 149 const SequenceToken sequence_token_;
150 const TaskTraits traits_; 150 const TaskTraits traits_;
151 151
152 DISALLOW_COPY_AND_ASSIGN(TestTaskSchedulerTaskRunner); 152 DISALLOW_COPY_AND_ASSIGN(TestTaskSchedulerTaskRunner);
153 }; 153 };
154 154
155 TestTaskScheduler::TestTaskScheduler(MessageLoop* external_message_loop) 155 TestTaskScheduler::TestTaskScheduler(MessageLoop* external_message_loop)
156 : message_loop_owned_(external_message_loop ? nullptr 156 : message_loop_owned_(external_message_loop ? nullptr
157 : MakeUnique<MessageLoop>()), 157 : MakeUnique<MessageLoop>()),
158 message_loop_(message_loop_owned_ ? message_loop_owned_.get() 158 message_loop_(message_loop_owned_ ? message_loop_owned_.get()
159 : external_message_loop) {} 159 : external_message_loop) {}
160 160
161 TestTaskScheduler::~TestTaskScheduler() { 161 TestTaskScheduler::~TestTaskScheduler() {
162 // Shutdown if it hasn't already been done explicitly. 162 // Shutdown if it hasn't already been done explicitly.
163 if (!task_tracker_.HasShutdownStarted()) 163 if (!task_tracker_.HasShutdownStarted())
164 Shutdown(); 164 Shutdown();
165 } 165 }
166 166
167 void TestTaskScheduler::PostDelayedTaskWithTraits( 167 void TestTaskScheduler::PostDelayedTaskWithTraits(
168 const tracked_objects::Location& from_here, 168 const tracked_objects::Location& from_here,
169 const TaskTraits& traits, 169 const TaskTraits& traits,
170 Closure task, 170 OnceClosure task,
171 TimeDelta delay) { 171 TimeDelta delay) {
172 CreateTaskRunnerWithTraits(traits)->PostDelayedTask(from_here, 172 CreateTaskRunnerWithTraits(traits)->PostDelayedTask(from_here,
173 std::move(task), delay); 173 std::move(task), delay);
174 } 174 }
175 175
176 scoped_refptr<TaskRunner> TestTaskScheduler::CreateTaskRunnerWithTraits( 176 scoped_refptr<TaskRunner> TestTaskScheduler::CreateTaskRunnerWithTraits(
177 const TaskTraits& traits) { 177 const TaskTraits& traits) {
178 return make_scoped_refptr( 178 return make_scoped_refptr(
179 new TestTaskSchedulerTaskRunner(this, ExecutionMode::PARALLEL, traits)); 179 new TestTaskSchedulerTaskRunner(this, ExecutionMode::PARALLEL, traits));
180 } 180 }
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
273 TaskTraits traits) 273 TaskTraits traits)
274 : task_scheduler_(task_scheduler), 274 : task_scheduler_(task_scheduler),
275 execution_mode_(execution_mode), 275 execution_mode_(execution_mode),
276 sequence_token_(execution_mode == ExecutionMode::PARALLEL 276 sequence_token_(execution_mode == ExecutionMode::PARALLEL
277 ? SequenceToken() 277 ? SequenceToken()
278 : SequenceToken::Create()), 278 : SequenceToken::Create()),
279 traits_(traits) {} 279 traits_(traits) {}
280 280
281 bool TestTaskSchedulerTaskRunner::PostDelayedTask( 281 bool TestTaskSchedulerTaskRunner::PostDelayedTask(
282 const tracked_objects::Location& from_here, 282 const tracked_objects::Location& from_here,
283 Closure closure, 283 OnceClosure closure,
284 TimeDelta delay) { 284 TimeDelta delay) {
285 auto task = 285 auto task =
286 MakeUnique<internal::Task>(from_here, std::move(closure), traits_, delay); 286 MakeUnique<internal::Task>(from_here, std::move(closure), traits_, delay);
287 if (execution_mode_ == ExecutionMode::SEQUENCED) 287 if (execution_mode_ == ExecutionMode::SEQUENCED)
288 task->sequenced_task_runner_ref = make_scoped_refptr(this); 288 task->sequenced_task_runner_ref = make_scoped_refptr(this);
289 else if (execution_mode_ == ExecutionMode::SINGLE_THREADED) 289 else if (execution_mode_ == ExecutionMode::SINGLE_THREADED)
290 task->single_thread_task_runner_ref = make_scoped_refptr(this); 290 task->single_thread_task_runner_ref = make_scoped_refptr(this);
291 return task_scheduler_->PostTask(std::move(task), sequence_token_); 291 return task_scheduler_->PostTask(std::move(task), sequence_token_);
292 } 292 }
293 293
294 bool TestTaskSchedulerTaskRunner::PostNonNestableDelayedTask( 294 bool TestTaskSchedulerTaskRunner::PostNonNestableDelayedTask(
295 const tracked_objects::Location& from_here, 295 const tracked_objects::Location& from_here,
296 Closure closure, 296 OnceClosure closure,
297 TimeDelta delay) { 297 TimeDelta delay) {
298 // Tasks are never nested within the task scheduler. 298 // Tasks are never nested within the task scheduler.
299 return PostDelayedTask(from_here, std::move(closure), delay); 299 return PostDelayedTask(from_here, std::move(closure), delay);
300 } 300 }
301 301
302 bool TestTaskSchedulerTaskRunner::RunsTasksOnCurrentThread() const { 302 bool TestTaskSchedulerTaskRunner::RunsTasksOnCurrentThread() const {
303 if (execution_mode_ == ExecutionMode::PARALLEL) 303 if (execution_mode_ == ExecutionMode::PARALLEL)
304 return task_scheduler_->RunsTasksOnCurrentThread(); 304 return task_scheduler_->RunsTasksOnCurrentThread();
305 return sequence_token_ == SequenceToken::GetForCurrentThread(); 305 return sequence_token_ == SequenceToken::GetForCurrentThread();
306 } 306 }
(...skipping 15 matching lines...) Expand all
322 DCHECK_EQ(task_scheduler_, TaskScheduler::GetInstance()); 322 DCHECK_EQ(task_scheduler_, TaskScheduler::GetInstance());
323 323
324 // Per contract, call JoinForTesting() before deleting the TaskScheduler. 324 // Per contract, call JoinForTesting() before deleting the TaskScheduler.
325 TaskScheduler::GetInstance()->JoinForTesting(); 325 TaskScheduler::GetInstance()->JoinForTesting();
326 326
327 TaskScheduler::SetInstance(nullptr); 327 TaskScheduler::SetInstance(nullptr);
328 } 328 }
329 329
330 } // namespace test 330 } // namespace test
331 } // namespace base 331 } // namespace base
OLDNEW
« no previous file with comments | « base/test/null_task_runner.cc ('k') | base/test/test_mock_time_task_runner.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698