OLD | NEW |
---|---|
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/task_scheduler/priority_queue.h" | 5 #include "base/task_scheduler/priority_queue.h" |
6 | 6 |
7 #include <memory> | 7 #include <memory> |
8 | 8 |
9 #include "base/bind.h" | |
9 #include "base/macros.h" | 10 #include "base/macros.h" |
10 #include "base/memory/ptr_util.h" | 11 #include "base/memory/ptr_util.h" |
11 #include "base/memory/ref_counted.h" | 12 #include "base/memory/ref_counted.h" |
12 #include "base/synchronization/waitable_event.h" | 13 #include "base/synchronization/waitable_event.h" |
13 #include "base/task_scheduler/sequence.h" | 14 #include "base/task_scheduler/sequence.h" |
14 #include "base/task_scheduler/task.h" | 15 #include "base/task_scheduler/task.h" |
15 #include "base/task_scheduler/task_traits.h" | 16 #include "base/task_scheduler/task_traits.h" |
16 #include "base/test/gtest_util.h" | 17 #include "base/test/gtest_util.h" |
17 #include "base/threading/platform_thread.h" | 18 #include "base/threading/platform_thread.h" |
18 #include "base/threading/simple_thread.h" | 19 #include "base/threading/simple_thread.h" |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
52 | 53 |
53 DISALLOW_COPY_AND_ASSIGN(ThreadBeginningTransaction); | 54 DISALLOW_COPY_AND_ASSIGN(ThreadBeginningTransaction); |
54 }; | 55 }; |
55 | 56 |
56 } // namespace | 57 } // namespace |
57 | 58 |
58 TEST(TaskSchedulerPriorityQueueTest, PushPopPeek) { | 59 TEST(TaskSchedulerPriorityQueueTest, PushPopPeek) { |
59 // Create test sequences. | 60 // Create test sequences. |
60 scoped_refptr<Sequence> sequence_a(new Sequence); | 61 scoped_refptr<Sequence> sequence_a(new Sequence); |
61 sequence_a->PushTask(MakeUnique<Task>( | 62 sequence_a->PushTask(MakeUnique<Task>( |
62 FROM_HERE, Closure(), | 63 FROM_HERE, Bind([] {}), |
gab
2017/04/03 17:06:17
Use DoNothing() from bind_helpers.h instead for al
tzik
2017/04/04 11:36:26
Done.
| |
63 TaskTraits().WithPriority(TaskPriority::USER_VISIBLE), TimeDelta())); | 64 TaskTraits().WithPriority(TaskPriority::USER_VISIBLE), TimeDelta())); |
64 SequenceSortKey sort_key_a = sequence_a->GetSortKey(); | 65 SequenceSortKey sort_key_a = sequence_a->GetSortKey(); |
65 | 66 |
66 scoped_refptr<Sequence> sequence_b(new Sequence); | 67 scoped_refptr<Sequence> sequence_b(new Sequence); |
67 sequence_b->PushTask(MakeUnique<Task>( | 68 sequence_b->PushTask(MakeUnique<Task>( |
68 FROM_HERE, Closure(), | 69 FROM_HERE, Bind([] {}), |
69 TaskTraits().WithPriority(TaskPriority::USER_BLOCKING), TimeDelta())); | 70 TaskTraits().WithPriority(TaskPriority::USER_BLOCKING), TimeDelta())); |
70 SequenceSortKey sort_key_b = sequence_b->GetSortKey(); | 71 SequenceSortKey sort_key_b = sequence_b->GetSortKey(); |
71 | 72 |
72 scoped_refptr<Sequence> sequence_c(new Sequence); | 73 scoped_refptr<Sequence> sequence_c(new Sequence); |
73 sequence_c->PushTask(MakeUnique<Task>( | 74 sequence_c->PushTask(MakeUnique<Task>( |
74 FROM_HERE, Closure(), | 75 FROM_HERE, Bind([] {}), |
75 TaskTraits().WithPriority(TaskPriority::USER_BLOCKING), TimeDelta())); | 76 TaskTraits().WithPriority(TaskPriority::USER_BLOCKING), TimeDelta())); |
76 SequenceSortKey sort_key_c = sequence_c->GetSortKey(); | 77 SequenceSortKey sort_key_c = sequence_c->GetSortKey(); |
77 | 78 |
78 scoped_refptr<Sequence> sequence_d(new Sequence); | 79 scoped_refptr<Sequence> sequence_d(new Sequence); |
79 sequence_d->PushTask(MakeUnique<Task>( | 80 sequence_d->PushTask(MakeUnique<Task>( |
80 FROM_HERE, Closure(), TaskTraits().WithPriority(TaskPriority::BACKGROUND), | 81 FROM_HERE, Bind([] {}), |
81 TimeDelta())); | 82 TaskTraits().WithPriority(TaskPriority::BACKGROUND), TimeDelta())); |
82 SequenceSortKey sort_key_d = sequence_d->GetSortKey(); | 83 SequenceSortKey sort_key_d = sequence_d->GetSortKey(); |
83 | 84 |
84 // Create a PriorityQueue and a Transaction. | 85 // Create a PriorityQueue and a Transaction. |
85 PriorityQueue pq; | 86 PriorityQueue pq; |
86 auto transaction(pq.BeginTransaction()); | 87 auto transaction(pq.BeginTransaction()); |
87 EXPECT_TRUE(transaction->IsEmpty()); | 88 EXPECT_TRUE(transaction->IsEmpty()); |
88 | 89 |
89 // Push |sequence_a| in the PriorityQueue. It becomes the sequence with the | 90 // Push |sequence_a| in the PriorityQueue. It becomes the sequence with the |
90 // highest priority. | 91 // highest priority. |
91 transaction->Push(sequence_a, sort_key_a); | 92 transaction->Push(sequence_a, sort_key_a); |
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
162 | 163 |
163 // End the Transaction on the current thread. | 164 // End the Transaction on the current thread. |
164 transaction.reset(); | 165 transaction.reset(); |
165 | 166 |
166 // The other thread should exit after its call to BeginTransaction() returns. | 167 // The other thread should exit after its call to BeginTransaction() returns. |
167 thread_beginning_transaction.Join(); | 168 thread_beginning_transaction.Join(); |
168 } | 169 } |
169 | 170 |
170 } // namespace internal | 171 } // namespace internal |
171 } // namespace base | 172 } // namespace base |
OLD | NEW |