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