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

Side by Side Diff: content/renderer/scheduler/webthread_impl_for_renderer_scheduler_unittest.cc

Issue 1033643004: Add a WorkerScheduler and a WebThreadImplForWorker (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix bug where tasks posted to a worker thread did not always run when the thread was shutdown 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/webthread_impl_for_scheduler.h" 5 #include "content/renderer/scheduler/webthread_impl_for_renderer_scheduler.h"
6 6
7 #include "base/run_loop.h" 7 #include "base/run_loop.h"
8 #include "content/child/scheduler/scheduler_message_loop_delegate.h" 8 #include "content/child/scheduler/scheduler_message_loop_delegate.h"
9 #include "content/renderer/scheduler/renderer_scheduler_impl.h" 9 #include "content/renderer/scheduler/renderer_scheduler_impl.h"
10 #include "testing/gmock/include/gmock/gmock.h" 10 #include "testing/gmock/include/gmock/gmock.h"
11 #include "testing/gtest/include/gtest/gtest.h" 11 #include "testing/gtest/include/gtest/gtest.h"
12 #include "third_party/WebKit/public/platform/WebTraceLocation.h" 12 #include "third_party/WebKit/public/platform/WebTraceLocation.h"
13 13
14 namespace content { 14 namespace content {
15 namespace { 15 namespace {
16 16
17 const int kWorkBatchSize = 2; 17 const int kWorkBatchSize = 2;
18 18
19 class MockTask : public blink::WebThread::Task { 19 class MockTask : public blink::WebThread::Task {
20 public: 20 public:
21 MOCK_METHOD0(run, void()); 21 MOCK_METHOD0(run, void());
22 }; 22 };
23 23
24 class MockTaskObserver : public blink::WebThread::TaskObserver { 24 class MockTaskObserver : public blink::WebThread::TaskObserver {
25 public: 25 public:
26 MOCK_METHOD0(willProcessTask, void()); 26 MOCK_METHOD0(willProcessTask, void());
27 MOCK_METHOD0(didProcessTask, void()); 27 MOCK_METHOD0(didProcessTask, void());
28 }; 28 };
29 } // namespace 29 } // namespace
30 30
31 class WebThreadImplForSchedulerTest : public testing::Test { 31 class WebThreadImplForRendererSchedulerTest : public testing::Test {
32 public: 32 public:
33 WebThreadImplForSchedulerTest() 33 WebThreadImplForRendererSchedulerTest()
34 : scheduler_(SchedulerMessageLoopDelegate::Create(&message_loop_)), 34 : scheduler_(SchedulerMessageLoopDelegate::Create(&message_loop_)),
35 default_task_runner_(scheduler_.DefaultTaskRunner()), 35 default_task_runner_(scheduler_.DefaultTaskRunner()),
36 thread_(&scheduler_) {} 36 thread_(&scheduler_) {}
37 37
38 ~WebThreadImplForSchedulerTest() override {} 38 ~WebThreadImplForRendererSchedulerTest() override {}
39 39
40 void SetWorkBatchSizeForTesting(size_t work_batch_size) { 40 void SetWorkBatchSizeForTesting(size_t work_batch_size) {
41 scheduler_.SetWorkBatchSizeForTesting(work_batch_size); 41 scheduler_.SetWorkBatchSizeForTesting(work_batch_size);
42 } 42 }
43 43
44 protected: 44 protected:
45 void EatDefaultTask(MockTaskObserver* observer) { 45 void EatDefaultTask(MockTaskObserver* observer) {
46 // The scheduler posts one extra DoWork() task automatically. 46 // The scheduler posts one extra DoWork() task automatically.
47 EXPECT_CALL(*observer, willProcessTask()); 47 EXPECT_CALL(*observer, willProcessTask());
48 EXPECT_CALL(*observer, didProcessTask()); 48 EXPECT_CALL(*observer, didProcessTask());
49 } 49 }
50 50
51 base::MessageLoop message_loop_; 51 base::MessageLoop message_loop_;
52 RendererSchedulerImpl scheduler_; 52 RendererSchedulerImpl scheduler_;
53 scoped_refptr<base::SingleThreadTaskRunner> default_task_runner_; 53 scoped_refptr<base::SingleThreadTaskRunner> default_task_runner_;
54 WebThreadImplForScheduler thread_; 54 WebThreadImplForRendererScheduler thread_;
55 55
56 DISALLOW_COPY_AND_ASSIGN(WebThreadImplForSchedulerTest); 56 DISALLOW_COPY_AND_ASSIGN(WebThreadImplForRendererSchedulerTest);
57 }; 57 };
58 58
59 TEST_F(WebThreadImplForSchedulerTest, TestTaskObserver) { 59 TEST_F(WebThreadImplForRendererSchedulerTest, TestTaskObserver) {
60 MockTaskObserver observer; 60 MockTaskObserver observer;
61 thread_.addTaskObserver(&observer); 61 thread_.addTaskObserver(&observer);
62 scoped_ptr<MockTask> task(new MockTask()); 62 scoped_ptr<MockTask> task(new MockTask());
63 63
64 { 64 {
65 testing::InSequence sequence; 65 testing::InSequence sequence;
66 EXPECT_CALL(observer, willProcessTask()); 66 EXPECT_CALL(observer, willProcessTask());
67 EXPECT_CALL(*task, run()); 67 EXPECT_CALL(*task, run());
68 EXPECT_CALL(observer, didProcessTask()); 68 EXPECT_CALL(observer, didProcessTask());
69 69
70 EatDefaultTask(&observer); 70 EatDefaultTask(&observer);
71 } 71 }
72 72
73 thread_.postTask(blink::WebTraceLocation(), task.release()); 73 thread_.postTask(blink::WebTraceLocation(), task.release());
74 message_loop_.RunUntilIdle(); 74 message_loop_.RunUntilIdle();
75 thread_.removeTaskObserver(&observer); 75 thread_.removeTaskObserver(&observer);
76 } 76 }
77 77
78 TEST_F(WebThreadImplForSchedulerTest, TestWorkBatchWithOneTask) { 78 TEST_F(WebThreadImplForRendererSchedulerTest, TestWorkBatchWithOneTask) {
79 MockTaskObserver observer; 79 MockTaskObserver observer;
80 thread_.addTaskObserver(&observer); 80 thread_.addTaskObserver(&observer);
81 scoped_ptr<MockTask> task(new MockTask()); 81 scoped_ptr<MockTask> task(new MockTask());
82 82
83 scheduler_.SetWorkBatchSizeForTesting(kWorkBatchSize); 83 scheduler_.SetWorkBatchSizeForTesting(kWorkBatchSize);
84 { 84 {
85 testing::InSequence sequence; 85 testing::InSequence sequence;
86 EXPECT_CALL(observer, willProcessTask()); 86 EXPECT_CALL(observer, willProcessTask());
87 EXPECT_CALL(*task, run()); 87 EXPECT_CALL(*task, run());
88 EXPECT_CALL(observer, didProcessTask()); 88 EXPECT_CALL(observer, didProcessTask());
89 89
90 EatDefaultTask(&observer); 90 EatDefaultTask(&observer);
91 } 91 }
92 92
93 thread_.postTask(blink::WebTraceLocation(), task.release()); 93 thread_.postTask(blink::WebTraceLocation(), task.release());
94 message_loop_.RunUntilIdle(); 94 message_loop_.RunUntilIdle();
95 thread_.removeTaskObserver(&observer); 95 thread_.removeTaskObserver(&observer);
96 } 96 }
97 97
98 TEST_F(WebThreadImplForSchedulerTest, TestWorkBatchWithTwoTasks) { 98 TEST_F(WebThreadImplForRendererSchedulerTest, TestWorkBatchWithTwoTasks) {
99 MockTaskObserver observer; 99 MockTaskObserver observer;
100 thread_.addTaskObserver(&observer); 100 thread_.addTaskObserver(&observer);
101 scoped_ptr<MockTask> task1(new MockTask()); 101 scoped_ptr<MockTask> task1(new MockTask());
102 scoped_ptr<MockTask> task2(new MockTask()); 102 scoped_ptr<MockTask> task2(new MockTask());
103 103
104 scheduler_.SetWorkBatchSizeForTesting(kWorkBatchSize); 104 scheduler_.SetWorkBatchSizeForTesting(kWorkBatchSize);
105 { 105 {
106 testing::InSequence sequence; 106 testing::InSequence sequence;
107 EXPECT_CALL(observer, willProcessTask()); 107 EXPECT_CALL(observer, willProcessTask());
108 EXPECT_CALL(*task1, run()); 108 EXPECT_CALL(*task1, run());
109 EXPECT_CALL(observer, didProcessTask()); 109 EXPECT_CALL(observer, didProcessTask());
110 110
111 EXPECT_CALL(observer, willProcessTask()); 111 EXPECT_CALL(observer, willProcessTask());
112 EXPECT_CALL(*task2, run()); 112 EXPECT_CALL(*task2, run());
113 EXPECT_CALL(observer, didProcessTask()); 113 EXPECT_CALL(observer, didProcessTask());
114 114
115 EatDefaultTask(&observer); 115 EatDefaultTask(&observer);
116 } 116 }
117 117
118 thread_.postTask(blink::WebTraceLocation(), task1.release()); 118 thread_.postTask(blink::WebTraceLocation(), task1.release());
119 thread_.postTask(blink::WebTraceLocation(), task2.release()); 119 thread_.postTask(blink::WebTraceLocation(), task2.release());
120 message_loop_.RunUntilIdle(); 120 message_loop_.RunUntilIdle();
121 thread_.removeTaskObserver(&observer); 121 thread_.removeTaskObserver(&observer);
122 } 122 }
123 123
124 TEST_F(WebThreadImplForSchedulerTest, TestWorkBatchWithThreeTasks) { 124 TEST_F(WebThreadImplForRendererSchedulerTest, TestWorkBatchWithThreeTasks) {
125 MockTaskObserver observer; 125 MockTaskObserver observer;
126 thread_.addTaskObserver(&observer); 126 thread_.addTaskObserver(&observer);
127 scoped_ptr<MockTask> task1(new MockTask()); 127 scoped_ptr<MockTask> task1(new MockTask());
128 scoped_ptr<MockTask> task2(new MockTask()); 128 scoped_ptr<MockTask> task2(new MockTask());
129 scoped_ptr<MockTask> task3(new MockTask()); 129 scoped_ptr<MockTask> task3(new MockTask());
130 130
131 scheduler_.SetWorkBatchSizeForTesting(kWorkBatchSize); 131 scheduler_.SetWorkBatchSizeForTesting(kWorkBatchSize);
132 { 132 {
133 testing::InSequence sequence; 133 testing::InSequence sequence;
134 EXPECT_CALL(observer, willProcessTask()); 134 EXPECT_CALL(observer, willProcessTask());
(...skipping 30 matching lines...) Expand all
165 165
166 void EnterRunLoop(base::MessageLoop* message_loop, blink::WebThread* thread) { 166 void EnterRunLoop(base::MessageLoop* message_loop, blink::WebThread* thread) {
167 // Note: WebThreads do not support nested run loops, which is why we use a 167 // Note: WebThreads do not support nested run loops, which is why we use a
168 // run loop directly. 168 // run loop directly.
169 base::RunLoop run_loop; 169 base::RunLoop run_loop;
170 thread->postTask(blink::WebTraceLocation(), new ExitRunLoopTask(&run_loop)); 170 thread->postTask(blink::WebTraceLocation(), new ExitRunLoopTask(&run_loop));
171 message_loop->SetNestableTasksAllowed(true); 171 message_loop->SetNestableTasksAllowed(true);
172 run_loop.Run(); 172 run_loop.Run();
173 } 173 }
174 174
175 TEST_F(WebThreadImplForSchedulerTest, TestNestedRunLoop) { 175 TEST_F(WebThreadImplForRendererSchedulerTest, TestNestedRunLoop) {
176 MockTaskObserver observer; 176 MockTaskObserver observer;
177 thread_.addTaskObserver(&observer); 177 thread_.addTaskObserver(&observer);
178 178
179 { 179 {
180 testing::InSequence sequence; 180 testing::InSequence sequence;
181 181
182 // One callback for EnterRunLoop. 182 // One callback for EnterRunLoop.
183 EXPECT_CALL(observer, willProcessTask()); 183 EXPECT_CALL(observer, willProcessTask());
184 184
185 // A pair for ExitRunLoopTask. 185 // A pair for ExitRunLoopTask.
186 EXPECT_CALL(observer, willProcessTask()); 186 EXPECT_CALL(observer, willProcessTask());
187 EXPECT_CALL(observer, didProcessTask()); 187 EXPECT_CALL(observer, didProcessTask());
188 188
189 // A final callback for EnterRunLoop. 189 // A final callback for EnterRunLoop.
190 EXPECT_CALL(observer, didProcessTask()); 190 EXPECT_CALL(observer, didProcessTask());
191 191
192 EatDefaultTask(&observer); 192 EatDefaultTask(&observer);
193 } 193 }
194 194
195 message_loop_.PostTask( 195 message_loop_.PostTask(
196 FROM_HERE, base::Bind(&EnterRunLoop, base::Unretained(&message_loop_), 196 FROM_HERE, base::Bind(&EnterRunLoop, base::Unretained(&message_loop_),
197 base::Unretained(&thread_))); 197 base::Unretained(&thread_)));
198 message_loop_.RunUntilIdle(); 198 message_loop_.RunUntilIdle();
199 thread_.removeTaskObserver(&observer); 199 thread_.removeTaskObserver(&observer);
200 } 200 }
201 201
202 } // namespace content 202 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698