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

Side by Side Diff: base/threading/sequenced_task_runner_handle_unittest.cc

Issue 1414793009: Allow SequencedTaskRunnerHandle::Get() while running unsequenced tasks. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Created 5 years, 1 month 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 "base/bind.h" 5 #include "base/bind.h"
6 #include "base/callback.h" 6 #include "base/callback.h"
7 #include "base/location.h" 7 #include "base/location.h"
8 #include "base/memory/ref_counted.h" 8 #include "base/memory/ref_counted.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
11 #include "base/run_loop.h" 11 #include "base/run_loop.h"
12 #include "base/sequence_checker_impl.h" 12 #include "base/sequence_checker_impl.h"
13 #include "base/sequenced_task_runner.h" 13 #include "base/sequenced_task_runner.h"
14 #include "base/synchronization/waitable_event.h" 14 #include "base/synchronization/waitable_event.h"
15 #include "base/test/sequenced_worker_pool_owner.h" 15 #include "base/test/sequenced_worker_pool_owner.h"
16 #include "base/threading/sequenced_task_runner_handle.h" 16 #include "base/threading/sequenced_task_runner_handle.h"
17 #include "base/threading/sequenced_worker_pool.h" 17 #include "base/threading/sequenced_worker_pool.h"
18 #include "base/threading/simple_thread.h" 18 #include "base/threading/simple_thread.h"
19 #include "testing/gtest/include/gtest/gtest.h" 19 #include "testing/gtest/include/gtest/gtest.h"
20 20
21 namespace base { 21 namespace base {
22 namespace { 22 namespace {
23 23
24 class SequencedTaskRunnerHandleTest : public ::testing::Test { 24 class SequencedTaskRunnerHandleTest : public ::testing::Test {
25 protected: 25 protected:
26 static void GetTaskRunner(const Closure& callback) { 26 static void GetTaskRunner(const Closure& callback) {
gab 2015/11/10 19:54:18 A "Get" method that returns void feels weird to me
Bernhard Bauer 2015/11/10 20:31:47 Done.
27 // Use SequenceCheckerImpl to make sure it's not a no-op in Release builds.
28 scoped_ptr<SequenceCheckerImpl> sequence_checker(new SequenceCheckerImpl);
29 ASSERT_TRUE(SequencedTaskRunnerHandle::IsSet()); 27 ASSERT_TRUE(SequencedTaskRunnerHandle::IsSet());
30 scoped_refptr<SequencedTaskRunner> task_runner = 28 scoped_refptr<SequencedTaskRunner> task_runner =
31 SequencedTaskRunnerHandle::Get(); 29 SequencedTaskRunnerHandle::Get();
32 ASSERT_TRUE(task_runner); 30 ASSERT_TRUE(task_runner);
31
32 // Use SequenceCheckerImpl to make sure it's not a no-op in Release builds.
33 scoped_ptr<SequenceCheckerImpl> sequence_checker(new SequenceCheckerImpl);
33 task_runner->PostTask( 34 task_runner->PostTask(
34 FROM_HERE, base::Bind(&SequencedTaskRunnerHandleTest::CheckValidThread, 35 FROM_HERE, base::Bind(&SequencedTaskRunnerHandleTest::CheckValidThread,
35 base::Passed(&sequence_checker), callback)); 36 base::Passed(&sequence_checker), callback));
36 } 37 }
37 38
38 private: 39 private:
39 static void CheckValidThread(scoped_ptr<SequenceCheckerImpl> sequence_checker, 40 static void CheckValidThread(scoped_ptr<SequenceCheckerImpl> sequence_checker,
40 const Closure& callback) { 41 const Closure& callback) {
41 EXPECT_TRUE(sequence_checker->CalledOnValidSequencedThread()); 42 EXPECT_TRUE(sequence_checker->CalledOnValidSequencedThread());
42 callback.Run(); 43 callback.Run();
43 } 44 }
44 45
45 MessageLoop message_loop_; 46 MessageLoop message_loop_;
46 }; 47 };
47 48
48 TEST_F(SequencedTaskRunnerHandleTest, FromMessageLoop) { 49 TEST_F(SequencedTaskRunnerHandleTest, FromMessageLoop) {
49 RunLoop run_loop; 50 RunLoop run_loop;
50 GetTaskRunner(run_loop.QuitClosure()); 51 GetTaskRunner(run_loop.QuitClosure());
51 run_loop.Run(); 52 run_loop.Run();
52 } 53 }
53 54
54 TEST_F(SequencedTaskRunnerHandleTest, FromSequencedWorkerPool) { 55 TEST_F(SequencedTaskRunnerHandleTest, FromSequencedWorkerPoolTask) {
55 // Wrap the SequencedWorkerPool to avoid leaks due to its asynchronous 56 // Wrap the SequencedWorkerPool to avoid leaks due to its asynchronous
56 // destruction. 57 // destruction.
57 SequencedWorkerPoolOwner owner(3, "Test"); 58 SequencedWorkerPoolOwner owner(3, "Test");
58 WaitableEvent event(false, false); 59 WaitableEvent event(false, false);
59 owner.pool()->PostSequencedWorkerTask( 60 owner.pool()->PostSequencedWorkerTask(
60 owner.pool()->GetSequenceToken(), FROM_HERE, 61 owner.pool()->GetSequenceToken(), FROM_HERE,
61 base::Bind(&SequencedTaskRunnerHandleTest::GetTaskRunner, 62 base::Bind(&SequencedTaskRunnerHandleTest::GetTaskRunner,
62 base::Bind(&WaitableEvent::Signal, base::Unretained(&event)))); 63 base::Bind(&WaitableEvent::Signal, base::Unretained(&event))));
63 event.Wait(); 64 event.Wait();
64 owner.pool()->Shutdown(); 65 owner.pool()->Shutdown();
65 } 66 }
66 67
68 TEST_F(SequencedTaskRunnerHandleTest, FromUnsequencedTask) {
gab 2015/11/10 19:54:18 Did you confirm that this test failed prior to the
Bernhard Bauer 2015/11/10 20:31:47 Yes: [ RUN ] SequencedTaskRunnerHandleTest.
69 // Wrap the SequencedWorkerPool to avoid leaks due to its asynchronous
70 // destruction.
71 SequencedWorkerPoolOwner owner(3, "Test");
72 WaitableEvent event(false, false);
73 owner.pool()->PostWorkerTask(
74 FROM_HERE,
75 base::Bind(&SequencedTaskRunnerHandleTest::GetTaskRunner,
76 base::Bind(&WaitableEvent::Signal, base::Unretained(&event))));
77 event.Wait();
78 owner.pool()->Shutdown();
79 }
80
67 class ThreadRunner : public DelegateSimpleThread::Delegate { 81 class ThreadRunner : public DelegateSimpleThread::Delegate {
68 public: 82 public:
69 void Run() override { 83 void Run() override {
70 ASSERT_FALSE(SequencedTaskRunnerHandle::IsSet()); 84 ASSERT_FALSE(SequencedTaskRunnerHandle::IsSet());
71 } 85 }
72 86
73 private: 87 private:
74 Closure callback_; 88 Closure callback_;
75 }; 89 };
76 90
77 TEST_F(SequencedTaskRunnerHandleTest, FromSimpleThread) { 91 TEST_F(SequencedTaskRunnerHandleTest, FromSimpleThread) {
78 ThreadRunner thread_runner; 92 ThreadRunner thread_runner;
79 DelegateSimpleThread thread(&thread_runner, "Background thread"); 93 DelegateSimpleThread thread(&thread_runner, "Background thread");
80 thread.Start(); 94 thread.Start();
81 thread.Join(); 95 thread.Join();
82 } 96 }
83 97
84 } // namespace 98 } // namespace
85 } // namespace base 99 } // namespace base
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698