| Index: content/renderer/scheduler/renderer_task_queue_selector_unittest.cc
|
| diff --git a/content/renderer/scheduler/renderer_task_queue_selector_unittest.cc b/content/renderer/scheduler/renderer_task_queue_selector_unittest.cc
|
| deleted file mode 100644
|
| index 1112beb6b89a6a4f8c7093ec608145877e452e67..0000000000000000000000000000000000000000
|
| --- a/content/renderer/scheduler/renderer_task_queue_selector_unittest.cc
|
| +++ /dev/null
|
| @@ -1,208 +0,0 @@
|
| -// Copyright 2014 The Chromium Authors. All rights reserved.
|
| -// Use of this source code is governed by a BSD-style license that can be
|
| -// found in the LICENSE file.
|
| -
|
| -#include "content/renderer/scheduler/renderer_task_queue_selector.h"
|
| -
|
| -#include "base/bind.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| -#include "base/memory/scoped_vector.h"
|
| -#include "base/pending_task.h"
|
| -#include "testing/gmock/include/gmock/gmock.h"
|
| -#include "testing/gtest/include/gtest/gtest.h"
|
| -
|
| -namespace content {
|
| -
|
| -class RendererTaskQueueSelectorTest : public testing::Test {
|
| - public:
|
| - RendererTaskQueueSelectorTest()
|
| - : test_closure_(
|
| - base::Bind(&RendererTaskQueueSelectorTest::TestFunction)) {}
|
| - ~RendererTaskQueueSelectorTest() override {}
|
| -
|
| - std::vector<base::PendingTask> GetTasks(int count) {
|
| - std::vector<base::PendingTask> tasks;
|
| - for (int i = 0; i < count; i++) {
|
| - base::PendingTask task = base::PendingTask(FROM_HERE, test_closure_);
|
| - task.sequence_num = i;
|
| - tasks.push_back(task);
|
| - }
|
| - return tasks;
|
| - }
|
| -
|
| - void PushTasks(const std::vector<base::PendingTask>& tasks,
|
| - const size_t queue_indices[]) {
|
| - for (size_t i = 0; i < tasks.size(); i++) {
|
| - task_queues_[queue_indices[i]]->push(tasks[i]);
|
| - }
|
| - }
|
| -
|
| - std::vector<size_t> PopTasks() {
|
| - std::vector<size_t> order;
|
| - size_t chosen_queue_index;
|
| - while (selector_.SelectWorkQueueToService(&chosen_queue_index)) {
|
| - order.push_back(chosen_queue_index);
|
| - task_queues_[chosen_queue_index]->pop();
|
| - }
|
| - return order;
|
| - }
|
| -
|
| - static void TestFunction() {}
|
| -
|
| - protected:
|
| - void SetUp() final {
|
| - std::vector<const base::TaskQueue*> const_task_queues;
|
| - for (size_t i = 0; i < kTaskQueueCount; i++) {
|
| - scoped_ptr<base::TaskQueue> task_queue(new base::TaskQueue());
|
| - const_task_queues.push_back(task_queue.get());
|
| - task_queues_.push_back(task_queue.release());
|
| - }
|
| - selector_.RegisterWorkQueues(const_task_queues);
|
| - for (size_t i = 0; i < kTaskQueueCount; i++)
|
| - EXPECT_TRUE(selector_.IsQueueEnabled(i)) << i;
|
| - }
|
| -
|
| - const size_t kTaskQueueCount = 5;
|
| - base::Closure test_closure_;
|
| - RendererTaskQueueSelector selector_;
|
| - ScopedVector<base::TaskQueue> task_queues_;
|
| -};
|
| -
|
| -TEST_F(RendererTaskQueueSelectorTest, TestDefaultPriority) {
|
| - std::vector<base::PendingTask> tasks = GetTasks(5);
|
| - size_t queue_order[] = {4, 3, 2, 1, 0};
|
| - PushTasks(tasks, queue_order);
|
| - EXPECT_THAT(PopTasks(), testing::ElementsAre(4, 3, 2, 1, 0));
|
| -}
|
| -
|
| -TEST_F(RendererTaskQueueSelectorTest, TestHighPriority) {
|
| - std::vector<base::PendingTask> tasks = GetTasks(5);
|
| - size_t queue_order[] = {0, 1, 2, 3, 4};
|
| - PushTasks(tasks, queue_order);
|
| - selector_.SetQueuePriority(2, RendererTaskQueueSelector::HIGH_PRIORITY);
|
| - EXPECT_THAT(PopTasks(), testing::ElementsAre(2, 0, 1, 3, 4));
|
| -}
|
| -
|
| -TEST_F(RendererTaskQueueSelectorTest, TestBestEffortPriority) {
|
| - std::vector<base::PendingTask> tasks = GetTasks(5);
|
| - size_t queue_order[] = {0, 1, 2, 3, 4};
|
| - PushTasks(tasks, queue_order);
|
| - selector_.SetQueuePriority(0,
|
| - RendererTaskQueueSelector::BEST_EFFORT_PRIORITY);
|
| - selector_.SetQueuePriority(2, RendererTaskQueueSelector::HIGH_PRIORITY);
|
| - EXPECT_THAT(PopTasks(), testing::ElementsAre(2, 1, 3, 4, 0));
|
| -}
|
| -
|
| -TEST_F(RendererTaskQueueSelectorTest, TestControlPriority) {
|
| - std::vector<base::PendingTask> tasks = GetTasks(5);
|
| - size_t queue_order[] = {0, 1, 2, 3, 4};
|
| - PushTasks(tasks, queue_order);
|
| - selector_.SetQueuePriority(4, RendererTaskQueueSelector::CONTROL_PRIORITY);
|
| - EXPECT_TRUE(selector_.IsQueueEnabled(4));
|
| - selector_.SetQueuePriority(2, RendererTaskQueueSelector::HIGH_PRIORITY);
|
| - EXPECT_TRUE(selector_.IsQueueEnabled(2));
|
| - EXPECT_THAT(PopTasks(), testing::ElementsAre(4, 2, 0, 1, 3));
|
| -}
|
| -
|
| -TEST_F(RendererTaskQueueSelectorTest, TestDisableEnable) {
|
| - std::vector<base::PendingTask> tasks = GetTasks(5);
|
| - size_t queue_order[] = {0, 1, 2, 3, 4};
|
| - PushTasks(tasks, queue_order);
|
| - selector_.DisableQueue(2);
|
| - EXPECT_FALSE(selector_.IsQueueEnabled(2));
|
| - selector_.DisableQueue(4);
|
| - EXPECT_FALSE(selector_.IsQueueEnabled(4));
|
| - EXPECT_THAT(PopTasks(), testing::ElementsAre(0, 1, 3));
|
| - selector_.EnableQueue(2, RendererTaskQueueSelector::BEST_EFFORT_PRIORITY);
|
| - EXPECT_THAT(PopTasks(), testing::ElementsAre(2));
|
| - selector_.EnableQueue(4, RendererTaskQueueSelector::NORMAL_PRIORITY);
|
| - EXPECT_THAT(PopTasks(), testing::ElementsAre(4));
|
| -}
|
| -
|
| -TEST_F(RendererTaskQueueSelectorTest, TestEmptyQueues) {
|
| - size_t chosen_queue_index = 0;
|
| - EXPECT_FALSE(selector_.SelectWorkQueueToService(&chosen_queue_index));
|
| -
|
| - // Test only disabled queues.
|
| - std::vector<base::PendingTask> tasks = GetTasks(1);
|
| - size_t queue_order[] = {0};
|
| - PushTasks(tasks, queue_order);
|
| - selector_.DisableQueue(0);
|
| - EXPECT_FALSE(selector_.IsQueueEnabled(0));
|
| - EXPECT_FALSE(selector_.SelectWorkQueueToService(&chosen_queue_index));
|
| -}
|
| -
|
| -TEST_F(RendererTaskQueueSelectorTest, TestDelay) {
|
| - std::vector<base::PendingTask> tasks = GetTasks(5);
|
| - tasks[0].delayed_run_time =
|
| - base::TimeTicks() + base::TimeDelta::FromMilliseconds(200);
|
| - tasks[3].delayed_run_time =
|
| - base::TimeTicks() + base::TimeDelta::FromMilliseconds(100);
|
| - size_t queue_order[] = {0, 1, 2, 3, 4};
|
| - PushTasks(tasks, queue_order);
|
| - EXPECT_THAT(PopTasks(), testing::ElementsAre(1, 2, 4, 3, 0));
|
| -}
|
| -
|
| -TEST_F(RendererTaskQueueSelectorTest, TestControlStarvesOthers) {
|
| - std::vector<base::PendingTask> tasks = GetTasks(4);
|
| - size_t queue_order[] = {0, 1, 2, 3};
|
| - PushTasks(tasks, queue_order);
|
| - selector_.SetQueuePriority(3, RendererTaskQueueSelector::CONTROL_PRIORITY);
|
| - selector_.SetQueuePriority(2, RendererTaskQueueSelector::HIGH_PRIORITY);
|
| - selector_.SetQueuePriority(1,
|
| - RendererTaskQueueSelector::BEST_EFFORT_PRIORITY);
|
| - for (int i = 0; i < 100; i++) {
|
| - size_t chosen_queue_index = 0;
|
| - EXPECT_TRUE(selector_.SelectWorkQueueToService(&chosen_queue_index));
|
| - EXPECT_EQ(3ul, chosen_queue_index);
|
| - // Don't remove task from queue to simulate all queues still being full.
|
| - }
|
| -}
|
| -
|
| -TEST_F(RendererTaskQueueSelectorTest, TestHighPriorityDoesNotStarveNormal) {
|
| - std::vector<base::PendingTask> tasks = GetTasks(3);
|
| - size_t queue_order[] = {0, 1, 2};
|
| - PushTasks(tasks, queue_order);
|
| - selector_.SetQueuePriority(2, RendererTaskQueueSelector::HIGH_PRIORITY);
|
| - selector_.SetQueuePriority(1,
|
| - RendererTaskQueueSelector::BEST_EFFORT_PRIORITY);
|
| - size_t counts[] = {0, 0, 0};
|
| - for (int i = 0; i < 100; i++) {
|
| - size_t chosen_queue_index = 0;
|
| - EXPECT_TRUE(selector_.SelectWorkQueueToService(&chosen_queue_index));
|
| - counts[chosen_queue_index]++;
|
| - // Don't remove task from queue to simulate all queues still being full.
|
| - }
|
| - EXPECT_GT(counts[0], 0ul); // Check high doesn't starve normal.
|
| - EXPECT_GT(counts[2], counts[0]); // Check high gets more chance to run.
|
| - EXPECT_EQ(0ul, counts[1]); // Check best effort is starved.
|
| -}
|
| -
|
| -TEST_F(RendererTaskQueueSelectorTest, TestBestEffortGetsStarved) {
|
| - std::vector<base::PendingTask> tasks = GetTasks(2);
|
| - size_t queue_order[] = {0, 1};
|
| - PushTasks(tasks, queue_order);
|
| - selector_.SetQueuePriority(0,
|
| - RendererTaskQueueSelector::BEST_EFFORT_PRIORITY);
|
| - selector_.SetQueuePriority(1, RendererTaskQueueSelector::NORMAL_PRIORITY);
|
| - size_t chosen_queue_index = 0;
|
| - for (int i = 0; i < 100; i++) {
|
| - EXPECT_TRUE(selector_.SelectWorkQueueToService(&chosen_queue_index));
|
| - EXPECT_EQ(1ul, chosen_queue_index);
|
| - // Don't remove task from queue to simulate all queues still being full.
|
| - }
|
| - selector_.SetQueuePriority(1, RendererTaskQueueSelector::HIGH_PRIORITY);
|
| - for (int i = 0; i < 100; i++) {
|
| - EXPECT_TRUE(selector_.SelectWorkQueueToService(&chosen_queue_index));
|
| - EXPECT_EQ(1ul, chosen_queue_index);
|
| - // Don't remove task from queue to simulate all queues still being full.
|
| - }
|
| - selector_.SetQueuePriority(1, RendererTaskQueueSelector::CONTROL_PRIORITY);
|
| - for (int i = 0; i < 100; i++) {
|
| - EXPECT_TRUE(selector_.SelectWorkQueueToService(&chosen_queue_index));
|
| - EXPECT_EQ(1ul, chosen_queue_index);
|
| - // Don't remove task from queue to simulate all queues still being full.
|
| - }
|
| -}
|
| -
|
| -} // namespace content
|
|
|