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

Side by Side Diff: base/task_scheduler/scheduler_worker_pool_impl.cc

Issue 2116163002: Add Lazy Creation and Thread Detachment Support in the Scheduler Worker Pool (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: CR Feedback fdoray@ Created 4 years, 5 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 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/scheduler_worker_pool_impl.h" 5 #include "base/task_scheduler/scheduler_worker_pool_impl.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <utility> 10 #include <utility>
11 11
12 #include "base/atomicops.h"
12 #include "base/bind.h" 13 #include "base/bind.h"
13 #include "base/bind_helpers.h" 14 #include "base/bind_helpers.h"
14 #include "base/lazy_instance.h" 15 #include "base/lazy_instance.h"
15 #include "base/memory/ptr_util.h" 16 #include "base/memory/ptr_util.h"
16 #include "base/sequenced_task_runner.h" 17 #include "base/sequenced_task_runner.h"
17 #include "base/single_thread_task_runner.h" 18 #include "base/single_thread_task_runner.h"
18 #include "base/strings/stringprintf.h" 19 #include "base/strings/stringprintf.h"
19 #include "base/task_scheduler/delayed_task_manager.h" 20 #include "base/task_scheduler/delayed_task_manager.h"
20 #include "base/task_scheduler/task_tracker.h" 21 #include "base/task_scheduler/task_tracker.h"
21 #include "base/threading/platform_thread.h" 22 #include "base/threading/platform_thread.h"
22 #include "base/threading/thread_local.h" 23 #include "base/threading/thread_local.h"
23 #include "base/threading/thread_restrictions.h" 24 #include "base/threading/thread_restrictions.h"
25 #include "base/time/time.h"
24 26
25 namespace base { 27 namespace base {
26 namespace internal { 28 namespace internal {
27 29
28 namespace { 30 namespace {
29 31
30 // SchedulerWorker that owns the current thread, if any. 32 // SchedulerWorker that owns the current thread, if any.
31 LazyInstance<ThreadLocalPointer<const SchedulerWorker>>::Leaky 33 LazyInstance<ThreadLocalPointer<const SchedulerWorker>>::Leaky
32 tls_current_worker = LAZY_INSTANCE_INITIALIZER; 34 tls_current_worker = LAZY_INSTANCE_INITIALIZER;
33 35
34 // SchedulerWorkerPool that owns the current thread, if any. 36 // SchedulerWorkerPool that owns the current thread, if any.
35 LazyInstance<ThreadLocalPointer<const SchedulerWorkerPool>>::Leaky 37 LazyInstance<ThreadLocalPointer<const SchedulerWorkerPool>>::Leaky
36 tls_current_worker_pool = LAZY_INSTANCE_INITIALIZER; 38 tls_current_worker_pool = LAZY_INSTANCE_INITIALIZER;
37 39
38 // A task runner that runs tasks with the PARALLEL ExecutionMode. 40 // A task runner that runs tasks with the PARALLEL ExecutionMode.
39 class SchedulerParallelTaskRunner : public TaskRunner { 41 class SchedulerParallelTaskRunner : public TaskRunner {
40 public: 42 public:
41 // Constructs a SchedulerParallelTaskRunner which can be used to post tasks so 43 // Constructs a SchedulerParallelTaskRunner which can be used to post tasks so
42 // long as |worker_pool| is alive. 44 // long as |worker_pool| is alive.
43 // TODO(robliao): Find a concrete way to manage |worker_pool|'s memory. 45 // TODO(robliao): Find a concrete way to manage |worker_pool|'s memory.
44 SchedulerParallelTaskRunner(const TaskTraits& traits, 46 SchedulerParallelTaskRunner(const TaskTraits& traits,
45 SchedulerWorkerPool* worker_pool) 47 SchedulerWorkerPool* worker_pool)
46 : traits_(traits), worker_pool_(worker_pool) {} 48 : traits_(traits), worker_pool_(worker_pool) {
49 DCHECK(worker_pool_);
50 }
47 51
48 // TaskRunner: 52 // TaskRunner:
49 bool PostDelayedTask(const tracked_objects::Location& from_here, 53 bool PostDelayedTask(const tracked_objects::Location& from_here,
50 const Closure& closure, 54 const Closure& closure,
51 TimeDelta delay) override { 55 TimeDelta delay) override {
52 // Post the task as part of a one-off single-task Sequence. 56 // Post the task as part of a one-off single-task Sequence.
53 return worker_pool_->PostTaskWithSequence( 57 return worker_pool_->PostTaskWithSequence(
54 WrapUnique(new Task(from_here, closure, traits_, delay)), 58 WrapUnique(new Task(from_here, closure, traits_, delay)),
55 make_scoped_refptr(new Sequence), nullptr); 59 make_scoped_refptr(new Sequence), nullptr);
56 } 60 }
(...skipping 12 matching lines...) Expand all
69 }; 73 };
70 74
71 // A task runner that runs tasks with the SEQUENCED ExecutionMode. 75 // A task runner that runs tasks with the SEQUENCED ExecutionMode.
72 class SchedulerSequencedTaskRunner : public SequencedTaskRunner { 76 class SchedulerSequencedTaskRunner : public SequencedTaskRunner {
73 public: 77 public:
74 // Constructs a SchedulerSequencedTaskRunner which can be used to post tasks 78 // Constructs a SchedulerSequencedTaskRunner which can be used to post tasks
75 // so long as |worker_pool| is alive. 79 // so long as |worker_pool| is alive.
76 // TODO(robliao): Find a concrete way to manage |worker_pool|'s memory. 80 // TODO(robliao): Find a concrete way to manage |worker_pool|'s memory.
77 SchedulerSequencedTaskRunner(const TaskTraits& traits, 81 SchedulerSequencedTaskRunner(const TaskTraits& traits,
78 SchedulerWorkerPool* worker_pool) 82 SchedulerWorkerPool* worker_pool)
79 : traits_(traits), worker_pool_(worker_pool) {} 83 : traits_(traits), worker_pool_(worker_pool) {
84 DCHECK(worker_pool_);
85 }
80 86
81 // SequencedTaskRunner: 87 // SequencedTaskRunner:
82 bool PostDelayedTask(const tracked_objects::Location& from_here, 88 bool PostDelayedTask(const tracked_objects::Location& from_here,
83 const Closure& closure, 89 const Closure& closure,
84 TimeDelta delay) override { 90 TimeDelta delay) override {
85 std::unique_ptr<Task> task(new Task(from_here, closure, traits_, delay)); 91 std::unique_ptr<Task> task(new Task(from_here, closure, traits_, delay));
86 task->sequenced_task_runner_ref = this; 92 task->sequenced_task_runner_ref = this;
87 93
88 // Post the task as part of |sequence_|. 94 // Post the task as part of |sequence_|.
89 return worker_pool_->PostTaskWithSequence(std::move(task), sequence_, 95 return worker_pool_->PostTaskWithSequence(std::move(task), sequence_,
(...skipping 16 matching lines...) Expand all
106 112
107 // Sequence for all Tasks posted through this TaskRunner. 113 // Sequence for all Tasks posted through this TaskRunner.
108 const scoped_refptr<Sequence> sequence_ = new Sequence; 114 const scoped_refptr<Sequence> sequence_ = new Sequence;
109 115
110 const TaskTraits traits_; 116 const TaskTraits traits_;
111 SchedulerWorkerPool* const worker_pool_; 117 SchedulerWorkerPool* const worker_pool_;
112 118
113 DISALLOW_COPY_AND_ASSIGN(SchedulerSequencedTaskRunner); 119 DISALLOW_COPY_AND_ASSIGN(SchedulerSequencedTaskRunner);
114 }; 120 };
115 121
116 // A task runner that runs tasks with the SINGLE_THREADED ExecutionMode.
117 class SchedulerSingleThreadTaskRunner : public SingleThreadTaskRunner {
118 public:
119 // Constructs a SchedulerSingleThreadTaskRunner which can be used to post
120 // tasks so long as |worker_pool| and |worker| are alive.
121 // TODO(robliao): Find a concrete way to manage the memory of |worker_pool|
122 // and |worker|.
123 SchedulerSingleThreadTaskRunner(const TaskTraits& traits,
124 SchedulerWorkerPool* worker_pool,
125 SchedulerWorker* worker)
126 : traits_(traits),
127 worker_pool_(worker_pool),
128 worker_(worker) {}
129
130 // SingleThreadTaskRunner:
131 bool PostDelayedTask(const tracked_objects::Location& from_here,
132 const Closure& closure,
133 TimeDelta delay) override {
134 std::unique_ptr<Task> task(new Task(from_here, closure, traits_, delay));
135 task->single_thread_task_runner_ref = this;
136
137 // Post the task to be executed by |worker_| as part of |sequence_|.
138 return worker_pool_->PostTaskWithSequence(std::move(task), sequence_,
139 worker_);
140 }
141
142 bool PostNonNestableDelayedTask(const tracked_objects::Location& from_here,
143 const Closure& closure,
144 base::TimeDelta delay) override {
145 // Tasks are never nested within the task scheduler.
146 return PostDelayedTask(from_here, closure, delay);
147 }
148
149 bool RunsTasksOnCurrentThread() const override {
150 return tls_current_worker.Get().Get() == worker_;
151 }
152
153 private:
154 ~SchedulerSingleThreadTaskRunner() override = default;
155
156 // Sequence for all Tasks posted through this TaskRunner.
157 const scoped_refptr<Sequence> sequence_ = new Sequence;
158
159 const TaskTraits traits_;
160 SchedulerWorkerPool* const worker_pool_;
161 SchedulerWorker* const worker_;
162
163 DISALLOW_COPY_AND_ASSIGN(SchedulerSingleThreadTaskRunner);
164 };
165
166 // Only used in DCHECKs. 122 // Only used in DCHECKs.
167 bool ContainsWorker( 123 bool ContainsWorker(
168 const std::vector<std::unique_ptr<SchedulerWorker>>& workers, 124 const std::vector<std::unique_ptr<SchedulerWorker>>& workers,
169 const SchedulerWorker* worker) { 125 const SchedulerWorker* worker) {
170 auto it = std::find_if(workers.begin(), workers.end(), 126 auto it = std::find_if(workers.begin(), workers.end(),
171 [worker](const std::unique_ptr<SchedulerWorker>& i) { 127 [worker](const std::unique_ptr<SchedulerWorker>& i) {
172 return i.get() == worker; 128 return i.get() == worker;
173 }); 129 });
174 return it != workers.end(); 130 return it != workers.end();
175 } 131 }
176 132
177 } // namespace 133 } // namespace
178 134
179 class SchedulerWorkerPoolImpl::SchedulerWorkerDelegateImpl 135 class SchedulerWorkerPoolImpl::SchedulerWorkerDelegateImpl
180 : public SchedulerWorker::Delegate { 136 : public SchedulerWorker::Delegate {
181 public: 137 public:
182 // |outer| owns the worker for which this delegate is constructed. 138 // |outer| owns the worker for which this delegate is constructed.
183 // |re_enqueue_sequence_callback| is invoked when ReEnqueueSequence() is 139 // |re_enqueue_sequence_callback| is invoked when ReEnqueueSequence() is
184 // called with a non-single-threaded Sequence. |shared_priority_queue| is a 140 // called with a non-single-threaded Sequence. |shared_priority_queue| is a
185 // PriorityQueue whose transactions may overlap with the worker's 141 // PriorityQueue whose transactions may overlap with the worker's
186 // single-threaded PriorityQueue's transactions. |index| will be appended to 142 // single-threaded PriorityQueue's transactions. |index| will be appended to
187 // the pool name to label the underlying worker threads. 143 // the pool name to label the underlying worker threads.
188 SchedulerWorkerDelegateImpl( 144 SchedulerWorkerDelegateImpl(
189 SchedulerWorkerPoolImpl* outer, 145 SchedulerWorkerPoolImpl* outer,
146 const TimeDelta& suggested_reclaim_time,
190 const ReEnqueueSequenceCallback& re_enqueue_sequence_callback, 147 const ReEnqueueSequenceCallback& re_enqueue_sequence_callback,
191 const PriorityQueue* shared_priority_queue, 148 const PriorityQueue* shared_priority_queue,
192 int index); 149 int index);
193 ~SchedulerWorkerDelegateImpl() override; 150 ~SchedulerWorkerDelegateImpl() override;
194 151
195 PriorityQueue* single_threaded_priority_queue() { 152 PriorityQueue* single_threaded_priority_queue() {
196 return &single_threaded_priority_queue_; 153 return &single_threaded_priority_queue_;
197 } 154 }
198 155
199 // SchedulerWorker::Delegate: 156 // SchedulerWorker::Delegate:
200 void OnMainEntry(SchedulerWorker* worker) override; 157 void OnMainEntry(SchedulerWorker* worker) override;
201 scoped_refptr<Sequence> GetWork(SchedulerWorker* worker) override; 158 scoped_refptr<Sequence> GetWork(SchedulerWorker* worker) override;
202 void ReEnqueueSequence(scoped_refptr<Sequence> sequence) override; 159 void ReEnqueueSequence(scoped_refptr<Sequence> sequence) override;
203 TimeDelta GetSleepTimeout() override; 160 TimeDelta GetSleepTimeout() override;
204 bool CanDetach(SchedulerWorker* worker) override; 161 bool CanDetach(SchedulerWorker* worker) override;
205 162
163 void RegisterSingleThreadTaskRunner() {
164 subtle::NoBarrier_AtomicIncrement(&num_single_threaded_runners_, 1);
165 }
166
167 void UnregisterSingleThreadTaskRunner() {
168 subtle::NoBarrier_AtomicIncrement(&num_single_threaded_runners_, -1);
169 }
170
206 private: 171 private:
207 SchedulerWorkerPoolImpl* outer_; 172 SchedulerWorkerPoolImpl* outer_;
173 const TimeDelta suggested_reclaim_time_;
208 const ReEnqueueSequenceCallback re_enqueue_sequence_callback_; 174 const ReEnqueueSequenceCallback re_enqueue_sequence_callback_;
209 175
210 // Single-threaded PriorityQueue for the worker. 176 // Single-threaded PriorityQueue for the worker.
211 PriorityQueue single_threaded_priority_queue_; 177 PriorityQueue single_threaded_priority_queue_;
212 178
213 // True if the last Sequence returned by GetWork() was extracted from 179 // True if the last Sequence returned by GetWork() was extracted from
214 // |single_threaded_priority_queue_|. 180 // |single_threaded_priority_queue_|.
215 bool last_sequence_is_single_threaded_ = false; 181 bool last_sequence_is_single_threaded_ = false;
216 182
183 // True if the worker performed and idle cycle. Workers start out idle.
fdoray 2016/07/08 18:58:06 an* idle cycle
robliao 2016/07/08 21:17:03 Done.
184 bool performed_idle_cycle_ = true;
185
186 subtle::Atomic32 num_single_threaded_runners_ = 0;
187
217 const int index_; 188 const int index_;
218 189
219 DISALLOW_COPY_AND_ASSIGN(SchedulerWorkerDelegateImpl); 190 DISALLOW_COPY_AND_ASSIGN(SchedulerWorkerDelegateImpl);
220 }; 191 };
221 192
193 // A task runner that runs tasks with the SINGLE_THREADED ExecutionMode.
194 class SchedulerWorkerPoolImpl::SchedulerSingleThreadTaskRunner :
195 public SingleThreadTaskRunner {
196 public:
197 // Constructs a SchedulerSingleThreadTaskRunner which can be used to post
198 // tasks so long as |worker_pool| and |worker| are alive.
199 // TODO(robliao): Find a concrete way to manage the memory of |worker_pool|
200 // and |worker|.
201 SchedulerSingleThreadTaskRunner(const TaskTraits& traits,
202 SchedulerWorkerPoolImpl* worker_pool,
203 SchedulerWorker* worker)
204 : traits_(traits),
205 worker_pool_(worker_pool),
206 worker_(worker) {
207 DCHECK(worker_pool_);
208 DCHECK(worker_);
209 static_cast<SchedulerWorkerDelegateImpl*>(worker_->delegate())->
210 RegisterSingleThreadTaskRunner();
211 }
212
213 // SingleThreadTaskRunner:
214 bool PostDelayedTask(const tracked_objects::Location& from_here,
215 const Closure& closure,
216 TimeDelta delay) override {
217 std::unique_ptr<Task> task(new Task(from_here, closure, traits_, delay));
218 task->single_thread_task_runner_ref = this;
219
220 // Post the task to be executed by |worker_| as part of |sequence_|.
221 return worker_pool_->PostTaskWithSequence(std::move(task), sequence_,
222 worker_);
223 }
224
225 bool PostNonNestableDelayedTask(const tracked_objects::Location& from_here,
226 const Closure& closure,
227 base::TimeDelta delay) override {
228 // Tasks are never nested within the task scheduler.
229 return PostDelayedTask(from_here, closure, delay);
230 }
231
232 bool RunsTasksOnCurrentThread() const override {
233 return tls_current_worker.Get().Get() == worker_;
234 }
235
236 private:
237 ~SchedulerSingleThreadTaskRunner() override {
238 static_cast<SchedulerWorkerDelegateImpl*>(worker_->delegate())->
239 UnregisterSingleThreadTaskRunner();
240 }
241
242 // Sequence for all Tasks posted through this TaskRunner.
243 const scoped_refptr<Sequence> sequence_ = new Sequence;
244
245 const TaskTraits traits_;
246 SchedulerWorkerPoolImpl* const worker_pool_;
247 SchedulerWorker* const worker_;
248
249 DISALLOW_COPY_AND_ASSIGN(SchedulerSingleThreadTaskRunner);
250 };
251
222 SchedulerWorkerPoolImpl::~SchedulerWorkerPoolImpl() { 252 SchedulerWorkerPoolImpl::~SchedulerWorkerPoolImpl() {
223 // SchedulerWorkerPool should never be deleted in production unless its 253 // SchedulerWorkerPool should never be deleted in production unless its
224 // initialization failed. 254 // initialization failed.
225 DCHECK(join_for_testing_returned_.IsSignaled() || workers_.empty()); 255 DCHECK(join_for_testing_returned_.IsSignaled() || workers_.empty());
226 } 256 }
227 257
228 // static 258 // static
229 std::unique_ptr<SchedulerWorkerPoolImpl> SchedulerWorkerPoolImpl::Create( 259 std::unique_ptr<SchedulerWorkerPoolImpl> SchedulerWorkerPoolImpl::Create(
230 StringPiece name, 260 StringPiece name,
231 ThreadPriority thread_priority, 261 ThreadPriority thread_priority,
232 size_t max_threads, 262 size_t max_threads,
233 IORestriction io_restriction, 263 IORestriction io_restriction,
264 const TimeDelta& suggested_reclaim_time,
234 const ReEnqueueSequenceCallback& re_enqueue_sequence_callback, 265 const ReEnqueueSequenceCallback& re_enqueue_sequence_callback,
235 TaskTracker* task_tracker, 266 TaskTracker* task_tracker,
236 DelayedTaskManager* delayed_task_manager) { 267 DelayedTaskManager* delayed_task_manager) {
237 std::unique_ptr<SchedulerWorkerPoolImpl> worker_pool( 268 std::unique_ptr<SchedulerWorkerPoolImpl> worker_pool(
238 new SchedulerWorkerPoolImpl(name, io_restriction, task_tracker, 269 new SchedulerWorkerPoolImpl(name, io_restriction, task_tracker,
239 delayed_task_manager)); 270 delayed_task_manager));
240 if (worker_pool->Initialize(thread_priority, max_threads, 271 if (worker_pool->Initialize(thread_priority, max_threads,
272 suggested_reclaim_time,
241 re_enqueue_sequence_callback)) { 273 re_enqueue_sequence_callback)) {
242 return worker_pool; 274 return worker_pool;
243 } 275 }
244 return nullptr; 276 return nullptr;
245 } 277 }
246 278
247 void SchedulerWorkerPoolImpl::WaitForAllWorkersIdleForTesting() { 279 void SchedulerWorkerPoolImpl::WaitForAllWorkersIdleForTesting() {
248 AutoSchedulerLock auto_lock(idle_workers_stack_lock_); 280 AutoSchedulerLock auto_lock(idle_workers_stack_lock_);
249 while (idle_workers_stack_.Size() < workers_.size()) 281 while (idle_workers_stack_.Size() < workers_.size())
250 idle_workers_stack_cv_for_testing_->Wait(); 282 idle_workers_stack_cv_for_testing_->Wait();
251 } 283 }
252 284
253 void SchedulerWorkerPoolImpl::JoinForTesting() { 285 void SchedulerWorkerPoolImpl::JoinForTesting() {
286 {
287 AutoSchedulerLock auto_lock(join_for_testing_called_lock_);
288 join_for_testing_called_ = true;
289 }
254 for (const auto& worker : workers_) 290 for (const auto& worker : workers_)
255 worker->JoinForTesting(); 291 worker->JoinForTesting();
256 292
257 DCHECK(!join_for_testing_returned_.IsSignaled()); 293 DCHECK(!join_for_testing_returned_.IsSignaled());
258 join_for_testing_returned_.Signal(); 294 join_for_testing_returned_.Signal();
259 } 295 }
260 296
261 scoped_refptr<TaskRunner> SchedulerWorkerPoolImpl::CreateTaskRunnerWithTraits( 297 scoped_refptr<TaskRunner> SchedulerWorkerPoolImpl::CreateTaskRunnerWithTraits(
262 const TaskTraits& traits, 298 const TaskTraits& traits,
263 ExecutionMode execution_mode) { 299 ExecutionMode execution_mode) {
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
364 if (worker) 400 if (worker)
365 worker->WakeUp(); 401 worker->WakeUp();
366 else 402 else
367 WakeUpOneWorker(); 403 WakeUpOneWorker();
368 } 404 }
369 } 405 }
370 406
371 SchedulerWorkerPoolImpl::SchedulerWorkerDelegateImpl:: 407 SchedulerWorkerPoolImpl::SchedulerWorkerDelegateImpl::
372 SchedulerWorkerDelegateImpl( 408 SchedulerWorkerDelegateImpl(
373 SchedulerWorkerPoolImpl* outer, 409 SchedulerWorkerPoolImpl* outer,
410 const TimeDelta& suggested_reclaim_time,
374 const ReEnqueueSequenceCallback& re_enqueue_sequence_callback, 411 const ReEnqueueSequenceCallback& re_enqueue_sequence_callback,
375 const PriorityQueue* shared_priority_queue, 412 const PriorityQueue* shared_priority_queue,
376 int index) 413 int index)
377 : outer_(outer), 414 : outer_(outer),
415 suggested_reclaim_time_(suggested_reclaim_time),
378 re_enqueue_sequence_callback_(re_enqueue_sequence_callback), 416 re_enqueue_sequence_callback_(re_enqueue_sequence_callback),
379 single_threaded_priority_queue_(shared_priority_queue), 417 single_threaded_priority_queue_(shared_priority_queue),
380 index_(index) {} 418 index_(index) {}
381 419
382 SchedulerWorkerPoolImpl::SchedulerWorkerDelegateImpl:: 420 SchedulerWorkerPoolImpl::SchedulerWorkerDelegateImpl::
383 ~SchedulerWorkerDelegateImpl() = default; 421 ~SchedulerWorkerDelegateImpl() = default;
384 422
385 void SchedulerWorkerPoolImpl::SchedulerWorkerDelegateImpl::OnMainEntry( 423 void SchedulerWorkerPoolImpl::SchedulerWorkerDelegateImpl::OnMainEntry(
386 SchedulerWorker* worker) { 424 SchedulerWorker* worker) {
387 #if DCHECK_IS_ON() 425 #if DCHECK_IS_ON()
388 // Wait for |outer_->workers_created_| to avoid traversing 426 // Wait for |outer_->workers_created_| to avoid traversing
389 // |outer_->workers_| while it is being filled by Initialize(). 427 // |outer_->workers_| while it is being filled by Initialize().
390 outer_->workers_created_.Wait(); 428 outer_->workers_created_.Wait();
391 DCHECK(ContainsWorker(outer_->workers_, worker)); 429 DCHECK(ContainsWorker(outer_->workers_, worker));
392 #endif 430 #endif
393 431
394 PlatformThread::SetName( 432 PlatformThread::SetName(
395 StringPrintf("%sWorker%d", outer_->name_.c_str(), index_)); 433 StringPrintf("%sWorker%d", outer_->name_.c_str(), index_));
396 434
397 DCHECK(!tls_current_worker.Get().Get()); 435 DCHECK(!tls_current_worker.Get().Get());
398 DCHECK(!tls_current_worker_pool.Get().Get()); 436 DCHECK(!tls_current_worker_pool.Get().Get());
399 tls_current_worker.Get().Set(worker); 437 tls_current_worker.Get().Set(worker);
400 tls_current_worker_pool.Get().Set(outer_); 438 tls_current_worker_pool.Get().Set(outer_);
401 439
440 // Workers start out idle, so this counts as an idle cycle.
441 performed_idle_cycle_ = true;
442
402 ThreadRestrictions::SetIOAllowed(outer_->io_restriction_ == 443 ThreadRestrictions::SetIOAllowed(outer_->io_restriction_ ==
403 IORestriction::ALLOWED); 444 IORestriction::ALLOWED);
404 } 445 }
405 446
406 scoped_refptr<Sequence> 447 scoped_refptr<Sequence>
407 SchedulerWorkerPoolImpl::SchedulerWorkerDelegateImpl::GetWork( 448 SchedulerWorkerPoolImpl::SchedulerWorkerDelegateImpl::GetWork(
408 SchedulerWorker* worker) { 449 SchedulerWorker* worker) {
409 DCHECK(ContainsWorker(outer_->workers_, worker)); 450 DCHECK(ContainsWorker(outer_->workers_, worker));
410 451
411 scoped_refptr<Sequence> sequence; 452 scoped_refptr<Sequence> sequence;
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
448 sequence = shared_transaction->PopSequence(); 489 sequence = shared_transaction->PopSequence();
449 last_sequence_is_single_threaded_ = false; 490 last_sequence_is_single_threaded_ = false;
450 } else { 491 } else {
451 DCHECK(!single_threaded_transaction->IsEmpty()); 492 DCHECK(!single_threaded_transaction->IsEmpty());
452 sequence = single_threaded_transaction->PopSequence(); 493 sequence = single_threaded_transaction->PopSequence();
453 last_sequence_is_single_threaded_ = true; 494 last_sequence_is_single_threaded_ = true;
454 } 495 }
455 } 496 }
456 DCHECK(sequence); 497 DCHECK(sequence);
457 498
499 // We're doing work, so this is not an idle cycle.
500 performed_idle_cycle_ = false;
501
458 outer_->RemoveFromIdleWorkersStack(worker); 502 outer_->RemoveFromIdleWorkersStack(worker);
459 return sequence; 503 return sequence;
460 } 504 }
461 505
462 void SchedulerWorkerPoolImpl::SchedulerWorkerDelegateImpl:: 506 void SchedulerWorkerPoolImpl::SchedulerWorkerDelegateImpl::
463 ReEnqueueSequence(scoped_refptr<Sequence> sequence) { 507 ReEnqueueSequence(scoped_refptr<Sequence> sequence) {
464 if (last_sequence_is_single_threaded_) { 508 if (last_sequence_is_single_threaded_) {
465 // A single-threaded Sequence is always re-enqueued in the single-threaded 509 // A single-threaded Sequence is always re-enqueued in the single-threaded
466 // PriorityQueue from which it was extracted. 510 // PriorityQueue from which it was extracted.
467 const SequenceSortKey sequence_sort_key = sequence->GetSortKey(); 511 const SequenceSortKey sequence_sort_key = sequence->GetSortKey();
468 single_threaded_priority_queue_.BeginTransaction()->Push( 512 single_threaded_priority_queue_.BeginTransaction()->Push(
469 std::move(sequence), sequence_sort_key); 513 std::move(sequence), sequence_sort_key);
470 } else { 514 } else {
471 // |re_enqueue_sequence_callback_| will determine in which PriorityQueue 515 // |re_enqueue_sequence_callback_| will determine in which PriorityQueue
472 // |sequence| must be enqueued. 516 // |sequence| must be enqueued.
473 re_enqueue_sequence_callback_.Run(std::move(sequence)); 517 re_enqueue_sequence_callback_.Run(std::move(sequence));
474 } 518 }
475 } 519 }
476 520
477 TimeDelta SchedulerWorkerPoolImpl::SchedulerWorkerDelegateImpl:: 521 TimeDelta SchedulerWorkerPoolImpl::SchedulerWorkerDelegateImpl::
478 GetSleepTimeout() { 522 GetSleepTimeout() {
479 return TimeDelta::Max(); 523 return suggested_reclaim_time_;
480 } 524 }
481 525
482 bool SchedulerWorkerPoolImpl::SchedulerWorkerDelegateImpl::CanDetach( 526 bool SchedulerWorkerPoolImpl::SchedulerWorkerDelegateImpl::CanDetach(
483 SchedulerWorker* worker) { 527 SchedulerWorker* worker) {
484 return false; 528 // It's not an issue if num_single_threaded_runners_ is incremented after this
fdoray 2016/07/08 18:58:06 |num_single_threaded_runners_|
robliao 2016/07/08 21:17:03 Done.
529 // because the next single-threaded task will simply pick up a new physical
530 // thread.
531 bool can_detach = performed_idle_cycle_ &&
fdoray 2016/07/08 18:58:07 const bool
robliao 2016/07/08 21:17:03 Done.
532 worker != outer_->PeekAtIdleWorkersStack() &&
533 !subtle::Release_Load(&num_single_threaded_runners_) &&
534 !outer_->HasJoinedForTesting();
fdoray 2016/07/08 18:58:07 Sadly this is racy: - Thread A: SchedulerWorker::C
robliao 2016/07/08 21:17:03 Yup. This became the first test that flew in the f
fdoray 2016/07/20 14:15:43 Acknowledged.
535 // CanDetach is part of a SchedulerWorker's idle cycle.
536 performed_idle_cycle_ = true;
537 return can_detach;
485 } 538 }
486 539
487 SchedulerWorkerPoolImpl::SchedulerWorkerPoolImpl( 540 SchedulerWorkerPoolImpl::SchedulerWorkerPoolImpl(
488 StringPiece name, 541 StringPiece name,
489 IORestriction io_restriction, 542 IORestriction io_restriction,
490 TaskTracker* task_tracker, 543 TaskTracker* task_tracker,
491 DelayedTaskManager* delayed_task_manager) 544 DelayedTaskManager* delayed_task_manager)
492 : name_(name.as_string()), 545 : name_(name.as_string()),
493 io_restriction_(io_restriction), 546 io_restriction_(io_restriction),
494 idle_workers_stack_lock_(shared_priority_queue_.container_lock()), 547 idle_workers_stack_lock_(shared_priority_queue_.container_lock()),
495 idle_workers_stack_cv_for_testing_( 548 idle_workers_stack_cv_for_testing_(
496 idle_workers_stack_lock_.CreateConditionVariable()), 549 idle_workers_stack_lock_.CreateConditionVariable()),
497 join_for_testing_returned_(WaitableEvent::ResetPolicy::MANUAL, 550 join_for_testing_returned_(WaitableEvent::ResetPolicy::MANUAL,
498 WaitableEvent::InitialState::NOT_SIGNALED), 551 WaitableEvent::InitialState::NOT_SIGNALED),
552 join_for_testing_called_(false),
499 #if DCHECK_IS_ON() 553 #if DCHECK_IS_ON()
500 workers_created_(WaitableEvent::ResetPolicy::MANUAL, 554 workers_created_(WaitableEvent::ResetPolicy::MANUAL,
501 WaitableEvent::InitialState::NOT_SIGNALED), 555 WaitableEvent::InitialState::NOT_SIGNALED),
502 #endif 556 #endif
503 task_tracker_(task_tracker), 557 task_tracker_(task_tracker),
504 delayed_task_manager_(delayed_task_manager) { 558 delayed_task_manager_(delayed_task_manager) {
505 DCHECK(task_tracker_); 559 DCHECK(task_tracker_);
506 DCHECK(delayed_task_manager_); 560 DCHECK(delayed_task_manager_);
507 } 561 }
508 562
509 bool SchedulerWorkerPoolImpl::Initialize( 563 bool SchedulerWorkerPoolImpl::Initialize(
510 ThreadPriority thread_priority, 564 ThreadPriority thread_priority,
511 size_t max_threads, 565 size_t max_threads,
566 const TimeDelta& suggested_reclaim_time,
512 const ReEnqueueSequenceCallback& re_enqueue_sequence_callback) { 567 const ReEnqueueSequenceCallback& re_enqueue_sequence_callback) {
513 AutoSchedulerLock auto_lock(idle_workers_stack_lock_); 568 AutoSchedulerLock auto_lock(idle_workers_stack_lock_);
514 569
515 DCHECK(workers_.empty()); 570 DCHECK(workers_.empty());
516 571
517 for (size_t i = 0; i < max_threads; ++i) { 572 for (size_t i = 0; i < max_threads; ++i) {
518 std::unique_ptr<SchedulerWorker> worker = 573 std::unique_ptr<SchedulerWorker> worker =
519 SchedulerWorker::Create( 574 SchedulerWorker::Create(
520 thread_priority, WrapUnique(new SchedulerWorkerDelegateImpl( 575 thread_priority, WrapUnique(new SchedulerWorkerDelegateImpl(
521 this, re_enqueue_sequence_callback, 576 this, suggested_reclaim_time,
577 re_enqueue_sequence_callback,
522 &shared_priority_queue_, static_cast<int>(i))), 578 &shared_priority_queue_, static_cast<int>(i))),
523 task_tracker_, 579 task_tracker_,
524 SchedulerWorker::InitialState::ALIVE); 580 i == 0
581 ? SchedulerWorker::InitialState::ALIVE
582 : SchedulerWorker::InitialState::DETACHED);
525 if (!worker) 583 if (!worker)
526 break; 584 break;
527 idle_workers_stack_.Push(worker.get()); 585 idle_workers_stack_.Push(worker.get());
528 workers_.push_back(std::move(worker)); 586 workers_.push_back(std::move(worker));
529 } 587 }
530 588
531 #if DCHECK_IS_ON() 589 #if DCHECK_IS_ON()
532 workers_created_.Signal(); 590 workers_created_.Signal();
533 #endif 591 #endif
534 592
535 return !workers_.empty(); 593 return !workers_.empty();
536 } 594 }
537 595
538 void SchedulerWorkerPoolImpl::WakeUpOneWorker() { 596 void SchedulerWorkerPoolImpl::WakeUpOneWorker() {
539 SchedulerWorker* worker; 597 SchedulerWorker* worker;
540 { 598 {
541 AutoSchedulerLock auto_lock(idle_workers_stack_lock_); 599 AutoSchedulerLock auto_lock(idle_workers_stack_lock_);
542 worker = idle_workers_stack_.Pop(); 600 worker = idle_workers_stack_.Pop();
543 } 601 }
544 if (worker) 602 if (worker)
545 worker->WakeUp(); 603 worker->WakeUp();
546 } 604 }
547 605
548 void SchedulerWorkerPoolImpl::AddToIdleWorkersStack( 606 void SchedulerWorkerPoolImpl::AddToIdleWorkersStack(
549 SchedulerWorker* worker) { 607 SchedulerWorker* worker) {
550 AutoSchedulerLock auto_lock(idle_workers_stack_lock_); 608 AutoSchedulerLock auto_lock(idle_workers_stack_lock_);
551 idle_workers_stack_.Push(worker); 609 // Detachment may cause multiple attempts to add because the delegate cannot
610 // determine who woke it up. As a result, when it wakes up, it may conclude
611 // there's no work to be done and attempt to add itself to the idle stack
612 // again.
613 if (!idle_workers_stack_.Contains(worker))
614 idle_workers_stack_.Push(worker);
615
552 DCHECK_LE(idle_workers_stack_.Size(), workers_.size()); 616 DCHECK_LE(idle_workers_stack_.Size(), workers_.size());
553 617
554 if (idle_workers_stack_.Size() == workers_.size()) 618 if (idle_workers_stack_.Size() == workers_.size())
555 idle_workers_stack_cv_for_testing_->Broadcast(); 619 idle_workers_stack_cv_for_testing_->Broadcast();
556 } 620 }
557 621
622 const SchedulerWorker* SchedulerWorkerPoolImpl::PeekAtIdleWorkersStack() const {
623 AutoSchedulerLock auto_lock(idle_workers_stack_lock_);
624 return idle_workers_stack_.Peek();
625 }
626
558 void SchedulerWorkerPoolImpl::RemoveFromIdleWorkersStack( 627 void SchedulerWorkerPoolImpl::RemoveFromIdleWorkersStack(
559 SchedulerWorker* worker) { 628 SchedulerWorker* worker) {
560 AutoSchedulerLock auto_lock(idle_workers_stack_lock_); 629 AutoSchedulerLock auto_lock(idle_workers_stack_lock_);
561 idle_workers_stack_.Remove(worker); 630 idle_workers_stack_.Remove(worker);
562 } 631 }
563 632
633 bool SchedulerWorkerPoolImpl::HasJoinedForTesting() {
634 AutoSchedulerLock auto_lock(join_for_testing_called_lock_);
635 return join_for_testing_called_;
636 }
637
564 } // namespace internal 638 } // namespace internal
565 } // namespace base 639 } // namespace base
OLDNEW
« no previous file with comments | « base/task_scheduler/scheduler_worker_pool_impl.h ('k') | base/task_scheduler/scheduler_worker_pool_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698