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

Side by Side Diff: content/child/scheduler/task_queue_selector_impl_unittest.cc

Issue 1025323003: Introduce a SchedulerHelper in content/child/scheduler (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added the delegate Created 5 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 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 "content/renderer/scheduler/renderer_task_queue_selector.h" 5 #include "content/child/scheduler/task_queue_selector_impl.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/memory/scoped_vector.h" 9 #include "base/memory/scoped_vector.h"
10 #include "base/pending_task.h" 10 #include "base/pending_task.h"
11 #include "testing/gmock/include/gmock/gmock.h" 11 #include "testing/gmock/include/gmock/gmock.h"
12 #include "testing/gtest/include/gtest/gtest.h" 12 #include "testing/gtest/include/gtest/gtest.h"
13 13
14 namespace content { 14 namespace content {
15 15
16 class RendererTaskQueueSelectorTest : public testing::Test { 16 class TaskQueueSelectorImplTest : public testing::Test {
17 public: 17 public:
18 RendererTaskQueueSelectorTest() 18 TaskQueueSelectorImplTest()
19 : test_closure_( 19 : test_closure_(base::Bind(&TaskQueueSelectorImplTest::TestFunction)) {}
20 base::Bind(&RendererTaskQueueSelectorTest::TestFunction)) {} 20 ~TaskQueueSelectorImplTest() override {}
21 ~RendererTaskQueueSelectorTest() override {}
22 21
23 std::vector<base::PendingTask> GetTasks(int count) { 22 std::vector<base::PendingTask> GetTasks(int count) {
24 std::vector<base::PendingTask> tasks; 23 std::vector<base::PendingTask> tasks;
25 for (int i = 0; i < count; i++) { 24 for (int i = 0; i < count; i++) {
26 base::PendingTask task = base::PendingTask(FROM_HERE, test_closure_); 25 base::PendingTask task = base::PendingTask(FROM_HERE, test_closure_);
27 task.sequence_num = i; 26 task.sequence_num = i;
28 tasks.push_back(task); 27 tasks.push_back(task);
29 } 28 }
30 return tasks; 29 return tasks;
31 } 30 }
(...skipping 25 matching lines...) Expand all
57 const_task_queues.push_back(task_queue.get()); 56 const_task_queues.push_back(task_queue.get());
58 task_queues_.push_back(task_queue.release()); 57 task_queues_.push_back(task_queue.release());
59 } 58 }
60 selector_.RegisterWorkQueues(const_task_queues); 59 selector_.RegisterWorkQueues(const_task_queues);
61 for (size_t i = 0; i < kTaskQueueCount; i++) 60 for (size_t i = 0; i < kTaskQueueCount; i++)
62 EXPECT_TRUE(selector_.IsQueueEnabled(i)) << i; 61 EXPECT_TRUE(selector_.IsQueueEnabled(i)) << i;
63 } 62 }
64 63
65 const size_t kTaskQueueCount = 5; 64 const size_t kTaskQueueCount = 5;
66 base::Closure test_closure_; 65 base::Closure test_closure_;
67 RendererTaskQueueSelector selector_; 66 TaskQueueSelectorImpl selector_;
68 ScopedVector<base::TaskQueue> task_queues_; 67 ScopedVector<base::TaskQueue> task_queues_;
69 }; 68 };
70 69
71 TEST_F(RendererTaskQueueSelectorTest, TestDefaultPriority) { 70 TEST_F(TaskQueueSelectorImplTest, TestDefaultPriority) {
72 std::vector<base::PendingTask> tasks = GetTasks(5); 71 std::vector<base::PendingTask> tasks = GetTasks(5);
73 size_t queue_order[] = {4, 3, 2, 1, 0}; 72 size_t queue_order[] = {4, 3, 2, 1, 0};
74 PushTasks(tasks, queue_order); 73 PushTasks(tasks, queue_order);
75 EXPECT_THAT(PopTasks(), testing::ElementsAre(4, 3, 2, 1, 0)); 74 EXPECT_THAT(PopTasks(), testing::ElementsAre(4, 3, 2, 1, 0));
76 } 75 }
77 76
78 TEST_F(RendererTaskQueueSelectorTest, TestHighPriority) { 77 TEST_F(TaskQueueSelectorImplTest, TestHighPriority) {
79 std::vector<base::PendingTask> tasks = GetTasks(5); 78 std::vector<base::PendingTask> tasks = GetTasks(5);
80 size_t queue_order[] = {0, 1, 2, 3, 4}; 79 size_t queue_order[] = {0, 1, 2, 3, 4};
81 PushTasks(tasks, queue_order); 80 PushTasks(tasks, queue_order);
82 selector_.SetQueuePriority(2, RendererTaskQueueSelector::HIGH_PRIORITY); 81 selector_.SetQueuePriority(2, TaskQueueSelectorImpl::HIGH_PRIORITY);
83 EXPECT_THAT(PopTasks(), testing::ElementsAre(2, 0, 1, 3, 4)); 82 EXPECT_THAT(PopTasks(), testing::ElementsAre(2, 0, 1, 3, 4));
84 } 83 }
85 84
86 TEST_F(RendererTaskQueueSelectorTest, TestBestEffortPriority) { 85 TEST_F(TaskQueueSelectorImplTest, TestBestEffortPriority) {
87 std::vector<base::PendingTask> tasks = GetTasks(5); 86 std::vector<base::PendingTask> tasks = GetTasks(5);
88 size_t queue_order[] = {0, 1, 2, 3, 4}; 87 size_t queue_order[] = {0, 1, 2, 3, 4};
89 PushTasks(tasks, queue_order); 88 PushTasks(tasks, queue_order);
90 selector_.SetQueuePriority(0, 89 selector_.SetQueuePriority(0, TaskQueueSelectorImpl::BEST_EFFORT_PRIORITY);
91 RendererTaskQueueSelector::BEST_EFFORT_PRIORITY); 90 selector_.SetQueuePriority(2, TaskQueueSelectorImpl::HIGH_PRIORITY);
92 selector_.SetQueuePriority(2, RendererTaskQueueSelector::HIGH_PRIORITY);
93 EXPECT_THAT(PopTasks(), testing::ElementsAre(2, 1, 3, 4, 0)); 91 EXPECT_THAT(PopTasks(), testing::ElementsAre(2, 1, 3, 4, 0));
94 } 92 }
95 93
96 TEST_F(RendererTaskQueueSelectorTest, TestControlPriority) { 94 TEST_F(TaskQueueSelectorImplTest, TestControlPriority) {
97 std::vector<base::PendingTask> tasks = GetTasks(5); 95 std::vector<base::PendingTask> tasks = GetTasks(5);
98 size_t queue_order[] = {0, 1, 2, 3, 4}; 96 size_t queue_order[] = {0, 1, 2, 3, 4};
99 PushTasks(tasks, queue_order); 97 PushTasks(tasks, queue_order);
100 selector_.SetQueuePriority(4, RendererTaskQueueSelector::CONTROL_PRIORITY); 98 selector_.SetQueuePriority(4, TaskQueueSelectorImpl::CONTROL_PRIORITY);
101 EXPECT_TRUE(selector_.IsQueueEnabled(4)); 99 EXPECT_TRUE(selector_.IsQueueEnabled(4));
102 selector_.SetQueuePriority(2, RendererTaskQueueSelector::HIGH_PRIORITY); 100 selector_.SetQueuePriority(2, TaskQueueSelectorImpl::HIGH_PRIORITY);
103 EXPECT_TRUE(selector_.IsQueueEnabled(2)); 101 EXPECT_TRUE(selector_.IsQueueEnabled(2));
104 EXPECT_THAT(PopTasks(), testing::ElementsAre(4, 2, 0, 1, 3)); 102 EXPECT_THAT(PopTasks(), testing::ElementsAre(4, 2, 0, 1, 3));
105 } 103 }
106 104
107 TEST_F(RendererTaskQueueSelectorTest, TestDisableEnable) { 105 TEST_F(TaskQueueSelectorImplTest, TestDisableEnable) {
108 std::vector<base::PendingTask> tasks = GetTasks(5); 106 std::vector<base::PendingTask> tasks = GetTasks(5);
109 size_t queue_order[] = {0, 1, 2, 3, 4}; 107 size_t queue_order[] = {0, 1, 2, 3, 4};
110 PushTasks(tasks, queue_order); 108 PushTasks(tasks, queue_order);
111 selector_.DisableQueue(2); 109 selector_.DisableQueue(2);
112 EXPECT_FALSE(selector_.IsQueueEnabled(2)); 110 EXPECT_FALSE(selector_.IsQueueEnabled(2));
113 selector_.DisableQueue(4); 111 selector_.DisableQueue(4);
114 EXPECT_FALSE(selector_.IsQueueEnabled(4)); 112 EXPECT_FALSE(selector_.IsQueueEnabled(4));
115 EXPECT_THAT(PopTasks(), testing::ElementsAre(0, 1, 3)); 113 EXPECT_THAT(PopTasks(), testing::ElementsAre(0, 1, 3));
116 selector_.EnableQueue(2, RendererTaskQueueSelector::BEST_EFFORT_PRIORITY); 114 selector_.EnableQueue(2, TaskQueueSelectorImpl::BEST_EFFORT_PRIORITY);
117 EXPECT_THAT(PopTasks(), testing::ElementsAre(2)); 115 EXPECT_THAT(PopTasks(), testing::ElementsAre(2));
118 selector_.EnableQueue(4, RendererTaskQueueSelector::NORMAL_PRIORITY); 116 selector_.EnableQueue(4, TaskQueueSelectorImpl::NORMAL_PRIORITY);
119 EXPECT_THAT(PopTasks(), testing::ElementsAre(4)); 117 EXPECT_THAT(PopTasks(), testing::ElementsAre(4));
120 } 118 }
121 119
122 TEST_F(RendererTaskQueueSelectorTest, TestEmptyQueues) { 120 TEST_F(TaskQueueSelectorImplTest, TestEmptyQueues) {
123 size_t chosen_queue_index = 0; 121 size_t chosen_queue_index = 0;
124 EXPECT_FALSE(selector_.SelectWorkQueueToService(&chosen_queue_index)); 122 EXPECT_FALSE(selector_.SelectWorkQueueToService(&chosen_queue_index));
125 123
126 // Test only disabled queues. 124 // Test only disabled queues.
127 std::vector<base::PendingTask> tasks = GetTasks(1); 125 std::vector<base::PendingTask> tasks = GetTasks(1);
128 size_t queue_order[] = {0}; 126 size_t queue_order[] = {0};
129 PushTasks(tasks, queue_order); 127 PushTasks(tasks, queue_order);
130 selector_.DisableQueue(0); 128 selector_.DisableQueue(0);
131 EXPECT_FALSE(selector_.IsQueueEnabled(0)); 129 EXPECT_FALSE(selector_.IsQueueEnabled(0));
132 EXPECT_FALSE(selector_.SelectWorkQueueToService(&chosen_queue_index)); 130 EXPECT_FALSE(selector_.SelectWorkQueueToService(&chosen_queue_index));
133 } 131 }
134 132
135 TEST_F(RendererTaskQueueSelectorTest, TestDelay) { 133 TEST_F(TaskQueueSelectorImplTest, TestDelay) {
136 std::vector<base::PendingTask> tasks = GetTasks(5); 134 std::vector<base::PendingTask> tasks = GetTasks(5);
137 tasks[0].delayed_run_time = 135 tasks[0].delayed_run_time =
138 base::TimeTicks() + base::TimeDelta::FromMilliseconds(200); 136 base::TimeTicks() + base::TimeDelta::FromMilliseconds(200);
139 tasks[3].delayed_run_time = 137 tasks[3].delayed_run_time =
140 base::TimeTicks() + base::TimeDelta::FromMilliseconds(100); 138 base::TimeTicks() + base::TimeDelta::FromMilliseconds(100);
141 size_t queue_order[] = {0, 1, 2, 3, 4}; 139 size_t queue_order[] = {0, 1, 2, 3, 4};
142 PushTasks(tasks, queue_order); 140 PushTasks(tasks, queue_order);
143 EXPECT_THAT(PopTasks(), testing::ElementsAre(1, 2, 4, 3, 0)); 141 EXPECT_THAT(PopTasks(), testing::ElementsAre(1, 2, 4, 3, 0));
144 } 142 }
145 143
146 TEST_F(RendererTaskQueueSelectorTest, TestControlStarvesOthers) { 144 TEST_F(TaskQueueSelectorImplTest, TestControlStarvesOthers) {
147 std::vector<base::PendingTask> tasks = GetTasks(4); 145 std::vector<base::PendingTask> tasks = GetTasks(4);
148 size_t queue_order[] = {0, 1, 2, 3}; 146 size_t queue_order[] = {0, 1, 2, 3};
149 PushTasks(tasks, queue_order); 147 PushTasks(tasks, queue_order);
150 selector_.SetQueuePriority(3, RendererTaskQueueSelector::CONTROL_PRIORITY); 148 selector_.SetQueuePriority(3, TaskQueueSelectorImpl::CONTROL_PRIORITY);
151 selector_.SetQueuePriority(2, RendererTaskQueueSelector::HIGH_PRIORITY); 149 selector_.SetQueuePriority(2, TaskQueueSelectorImpl::HIGH_PRIORITY);
152 selector_.SetQueuePriority(1, 150 selector_.SetQueuePriority(1, TaskQueueSelectorImpl::BEST_EFFORT_PRIORITY);
153 RendererTaskQueueSelector::BEST_EFFORT_PRIORITY);
154 for (int i = 0; i < 100; i++) { 151 for (int i = 0; i < 100; i++) {
155 size_t chosen_queue_index = 0; 152 size_t chosen_queue_index = 0;
156 EXPECT_TRUE(selector_.SelectWorkQueueToService(&chosen_queue_index)); 153 EXPECT_TRUE(selector_.SelectWorkQueueToService(&chosen_queue_index));
157 EXPECT_EQ(3ul, chosen_queue_index); 154 EXPECT_EQ(3ul, chosen_queue_index);
158 // Don't remove task from queue to simulate all queues still being full. 155 // Don't remove task from queue to simulate all queues still being full.
159 } 156 }
160 } 157 }
161 158
162 TEST_F(RendererTaskQueueSelectorTest, TestHighPriorityDoesNotStarveNormal) { 159 TEST_F(TaskQueueSelectorImplTest, TestHighPriorityDoesNotStarveNormal) {
163 std::vector<base::PendingTask> tasks = GetTasks(3); 160 std::vector<base::PendingTask> tasks = GetTasks(3);
164 size_t queue_order[] = {0, 1, 2}; 161 size_t queue_order[] = {0, 1, 2};
165 PushTasks(tasks, queue_order); 162 PushTasks(tasks, queue_order);
166 selector_.SetQueuePriority(2, RendererTaskQueueSelector::HIGH_PRIORITY); 163 selector_.SetQueuePriority(2, TaskQueueSelectorImpl::HIGH_PRIORITY);
167 selector_.SetQueuePriority(1, 164 selector_.SetQueuePriority(1, TaskQueueSelectorImpl::BEST_EFFORT_PRIORITY);
168 RendererTaskQueueSelector::BEST_EFFORT_PRIORITY);
169 size_t counts[] = {0, 0, 0}; 165 size_t counts[] = {0, 0, 0};
170 for (int i = 0; i < 100; i++) { 166 for (int i = 0; i < 100; i++) {
171 size_t chosen_queue_index = 0; 167 size_t chosen_queue_index = 0;
172 EXPECT_TRUE(selector_.SelectWorkQueueToService(&chosen_queue_index)); 168 EXPECT_TRUE(selector_.SelectWorkQueueToService(&chosen_queue_index));
173 counts[chosen_queue_index]++; 169 counts[chosen_queue_index]++;
174 // Don't remove task from queue to simulate all queues still being full. 170 // Don't remove task from queue to simulate all queues still being full.
175 } 171 }
176 EXPECT_GT(counts[0], 0ul); // Check high doesn't starve normal. 172 EXPECT_GT(counts[0], 0ul); // Check high doesn't starve normal.
177 EXPECT_GT(counts[2], counts[0]); // Check high gets more chance to run. 173 EXPECT_GT(counts[2], counts[0]); // Check high gets more chance to run.
178 EXPECT_EQ(0ul, counts[1]); // Check best effort is starved. 174 EXPECT_EQ(0ul, counts[1]); // Check best effort is starved.
179 } 175 }
180 176
181 TEST_F(RendererTaskQueueSelectorTest, TestBestEffortGetsStarved) { 177 TEST_F(TaskQueueSelectorImplTest, TestBestEffortGetsStarved) {
182 std::vector<base::PendingTask> tasks = GetTasks(2); 178 std::vector<base::PendingTask> tasks = GetTasks(2);
183 size_t queue_order[] = {0, 1}; 179 size_t queue_order[] = {0, 1};
184 PushTasks(tasks, queue_order); 180 PushTasks(tasks, queue_order);
185 selector_.SetQueuePriority(0, 181 selector_.SetQueuePriority(0, TaskQueueSelectorImpl::BEST_EFFORT_PRIORITY);
186 RendererTaskQueueSelector::BEST_EFFORT_PRIORITY); 182 selector_.SetQueuePriority(1, TaskQueueSelectorImpl::NORMAL_PRIORITY);
187 selector_.SetQueuePriority(1, RendererTaskQueueSelector::NORMAL_PRIORITY);
188 size_t chosen_queue_index = 0; 183 size_t chosen_queue_index = 0;
189 for (int i = 0; i < 100; i++) { 184 for (int i = 0; i < 100; i++) {
190 EXPECT_TRUE(selector_.SelectWorkQueueToService(&chosen_queue_index)); 185 EXPECT_TRUE(selector_.SelectWorkQueueToService(&chosen_queue_index));
191 EXPECT_EQ(1ul, chosen_queue_index); 186 EXPECT_EQ(1ul, chosen_queue_index);
192 // Don't remove task from queue to simulate all queues still being full. 187 // Don't remove task from queue to simulate all queues still being full.
193 } 188 }
194 selector_.SetQueuePriority(1, RendererTaskQueueSelector::HIGH_PRIORITY); 189 selector_.SetQueuePriority(1, TaskQueueSelectorImpl::HIGH_PRIORITY);
195 for (int i = 0; i < 100; i++) { 190 for (int i = 0; i < 100; i++) {
196 EXPECT_TRUE(selector_.SelectWorkQueueToService(&chosen_queue_index)); 191 EXPECT_TRUE(selector_.SelectWorkQueueToService(&chosen_queue_index));
197 EXPECT_EQ(1ul, chosen_queue_index); 192 EXPECT_EQ(1ul, chosen_queue_index);
198 // Don't remove task from queue to simulate all queues still being full. 193 // Don't remove task from queue to simulate all queues still being full.
199 } 194 }
200 selector_.SetQueuePriority(1, RendererTaskQueueSelector::CONTROL_PRIORITY); 195 selector_.SetQueuePriority(1, TaskQueueSelectorImpl::CONTROL_PRIORITY);
201 for (int i = 0; i < 100; i++) { 196 for (int i = 0; i < 100; i++) {
202 EXPECT_TRUE(selector_.SelectWorkQueueToService(&chosen_queue_index)); 197 EXPECT_TRUE(selector_.SelectWorkQueueToService(&chosen_queue_index));
203 EXPECT_EQ(1ul, chosen_queue_index); 198 EXPECT_EQ(1ul, chosen_queue_index);
204 // Don't remove task from queue to simulate all queues still being full. 199 // Don't remove task from queue to simulate all queues still being full.
205 } 200 }
206 } 201 }
207 202
208 } // namespace content 203 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698