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

Side by Side Diff: components/scheduler/child/task_queue_manager_unittest.cc

Issue 987193002: Redirect the MessageLoop's task runner to the renderer scheduler (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Review comments + refactor all the things Created 5 years, 5 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "components/scheduler/child/task_queue_manager.h" 5 #include "components/scheduler/child/task_queue_manager.h"
6 6
7 #include "base/location.h" 7 #include "base/location.h"
8 #include "base/single_thread_task_runner.h" 8 #include "base/single_thread_task_runner.h"
9 #include "base/test/simple_test_tick_clock.h" 9 #include "base/test/simple_test_tick_clock.h"
10 #include "base/threading/thread.h" 10 #include "base/threading/thread.h"
11 #include "cc/test/ordered_simple_task_runner.h" 11 #include "cc/test/ordered_simple_task_runner.h"
12 #include "components/scheduler/child/nestable_task_runner_for_test.h" 12 #include "components/scheduler/child/nestable_task_runner_for_test.h"
13 #include "components/scheduler/child/scheduler_message_loop_delegate.h" 13 #include "components/scheduler/child/scheduler_task_runner_delegate_impl.h"
14 #include "components/scheduler/child/task_queue_selector.h" 14 #include "components/scheduler/child/task_queue_selector.h"
15 #include "components/scheduler/child/test_time_source.h" 15 #include "components/scheduler/child/test_time_source.h"
16 #include "components/scheduler/test/test_always_fail_time_source.h" 16 #include "components/scheduler/test/test_always_fail_time_source.h"
17 #include "testing/gmock/include/gmock/gmock.h" 17 #include "testing/gmock/include/gmock/gmock.h"
18 18
19 using testing::ElementsAre; 19 using testing::ElementsAre;
20 using testing::_; 20 using testing::_;
21 21
22 namespace scheduler { 22 namespace scheduler {
23 namespace { 23 namespace {
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 enum class SelectorType { 115 enum class SelectorType {
116 Automatic, 116 Automatic,
117 Explicit, 117 Explicit,
118 }; 118 };
119 119
120 void Initialize(size_t num_queues, SelectorType type) { 120 void Initialize(size_t num_queues, SelectorType type) {
121 now_src_.reset(new base::SimpleTestTickClock()); 121 now_src_.reset(new base::SimpleTestTickClock());
122 now_src_->Advance(base::TimeDelta::FromMicroseconds(1000)); 122 now_src_->Advance(base::TimeDelta::FromMicroseconds(1000));
123 test_task_runner_ = make_scoped_refptr( 123 test_task_runner_ = make_scoped_refptr(
124 new cc::OrderedSimpleTaskRunner(now_src_.get(), false)); 124 new cc::OrderedSimpleTaskRunner(now_src_.get(), false));
125 main_task_runner_ =
126 NestableTaskRunnerForTest::Create(test_task_runner_.get());
125 selector_ = make_scoped_ptr(createSelectorForTest(type)); 127 selector_ = make_scoped_ptr(createSelectorForTest(type));
126 manager_ = make_scoped_ptr(new TaskQueueManager( 128 manager_ = make_scoped_ptr(
127 num_queues, NestableTaskRunnerForTest::Create(test_task_runner_.get()), 129 new TaskQueueManager(num_queues, main_task_runner_, selector_.get(),
128 selector_.get(), "test.scheduler", "test.scheduler.debug")); 130 "test.scheduler", "test.scheduler.debug"));
129 manager_->SetTimeSourceForTesting( 131 manager_->SetTimeSourceForTesting(
130 make_scoped_ptr(new TestTimeSource(now_src_.get()))); 132 make_scoped_ptr(new TestTimeSource(now_src_.get())));
131 133
132 EXPECT_EQ(num_queues, selector_->work_queues().size()); 134 EXPECT_EQ(num_queues, selector_->work_queues().size());
133 } 135 }
134 136
135 void InitializeWithRealMessageLoop(size_t num_queues, SelectorType type) { 137 void InitializeWithRealMessageLoop(size_t num_queues, SelectorType type) {
136 message_loop_.reset(new base::MessageLoop()); 138 message_loop_.reset(new base::MessageLoop());
137 selector_ = make_scoped_ptr(createSelectorForTest(type)); 139 selector_ = make_scoped_ptr(createSelectorForTest(type));
138 manager_ = make_scoped_ptr(new TaskQueueManager( 140 manager_ = make_scoped_ptr(new TaskQueueManager(
139 num_queues, SchedulerMessageLoopDelegate::Create(message_loop_.get()), 141 num_queues,
142 SchedulerTaskRunnerDelegateImpl::Create(message_loop_.get()),
140 selector_.get(), "test.scheduler", "test.scheduler.debug")); 143 selector_.get(), "test.scheduler", "test.scheduler.debug"));
141 EXPECT_EQ(num_queues, selector_->work_queues().size()); 144 EXPECT_EQ(num_queues, selector_->work_queues().size());
142 } 145 }
143 146
144 SelectorForTest* createSelectorForTest(SelectorType type) { 147 SelectorForTest* createSelectorForTest(SelectorType type) {
145 switch (type) { 148 switch (type) {
146 case SelectorType::Automatic: 149 case SelectorType::Automatic:
147 return new AutomaticSelectorForTest(); 150 return new AutomaticSelectorForTest();
148 151
149 case SelectorType::Explicit: 152 case SelectorType::Explicit:
(...skipping 20 matching lines...) Expand all
170 &TaskQueueManager::PumpPolicyToString); 173 &TaskQueueManager::PumpPolicyToString);
171 } 174 }
172 175
173 static void CheckAllWakeupPolicyToString() { 176 static void CheckAllWakeupPolicyToString() {
174 CallForEachEnumValue<TaskQueueManager::WakeupPolicy>( 177 CallForEachEnumValue<TaskQueueManager::WakeupPolicy>(
175 TaskQueueManager::WakeupPolicy::FIRST_WAKEUP_POLICY, 178 TaskQueueManager::WakeupPolicy::FIRST_WAKEUP_POLICY,
176 TaskQueueManager::WakeupPolicy::WAKEUP_POLICY_COUNT, 179 TaskQueueManager::WakeupPolicy::WAKEUP_POLICY_COUNT,
177 &TaskQueueManager::WakeupPolicyToString); 180 &TaskQueueManager::WakeupPolicyToString);
178 } 181 }
179 182
183 scoped_ptr<base::MessageLoop> message_loop_;
180 scoped_ptr<base::SimpleTestTickClock> now_src_; 184 scoped_ptr<base::SimpleTestTickClock> now_src_;
185 scoped_refptr<NestableTaskRunnerForTest> main_task_runner_;
181 scoped_refptr<cc::OrderedSimpleTaskRunner> test_task_runner_; 186 scoped_refptr<cc::OrderedSimpleTaskRunner> test_task_runner_;
182 scoped_ptr<SelectorForTest> selector_; 187 scoped_ptr<SelectorForTest> selector_;
183 scoped_ptr<TaskQueueManager> manager_; 188 scoped_ptr<TaskQueueManager> manager_;
184 scoped_ptr<base::MessageLoop> message_loop_;
185 }; 189 };
186 190
187 void PostFromNestedRunloop(base::MessageLoop* message_loop, 191 void PostFromNestedRunloop(base::MessageLoop* message_loop,
188 base::SingleThreadTaskRunner* runner, 192 base::SingleThreadTaskRunner* runner,
189 std::vector<std::pair<base::Closure, bool>>* tasks) { 193 std::vector<std::pair<base::Closure, bool>>* tasks) {
190 base::MessageLoop::ScopedNestableTaskAllower allow(message_loop); 194 base::MessageLoop::ScopedNestableTaskAllower allow(message_loop);
191 for (std::pair<base::Closure, bool>& pair : *tasks) { 195 for (std::pair<base::Closure, bool>& pair : *tasks) {
192 if (pair.second) { 196 if (pair.second) {
193 runner->PostTask(FROM_HERE, pair.first); 197 runner->PostTask(FROM_HERE, pair.first);
194 } else { 198 } else {
(...skipping 1041 matching lines...) Expand 10 before | Expand all | Expand 10 after
1236 manager_->GetQueueState(1)); 1240 manager_->GetQueueState(1));
1237 1241
1238 test_task_runner_->RunUntilIdle(); 1242 test_task_runner_->RunUntilIdle();
1239 EXPECT_EQ(TaskQueueManager::QueueState::EMPTY, 1243 EXPECT_EQ(TaskQueueManager::QueueState::EMPTY,
1240 manager_->GetQueueState(0)); 1244 manager_->GetQueueState(0));
1241 EXPECT_EQ(TaskQueueManager::QueueState::EMPTY, 1245 EXPECT_EQ(TaskQueueManager::QueueState::EMPTY,
1242 manager_->GetQueueState(1)); 1246 manager_->GetQueueState(1));
1243 } 1247 }
1244 1248
1245 } // namespace scheduler 1249 } // namespace scheduler
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698