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

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

Issue 2235283002: Fix incorrect memory barrier usage I previously asked to be introduced. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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
« no previous file with comments | « base/message_loop/message_loop.cc ('k') | base/task_scheduler/task_tracker.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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>
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 206
207 // SchedulerWorker::Delegate: 207 // SchedulerWorker::Delegate:
208 void OnMainEntry(SchedulerWorker* worker, 208 void OnMainEntry(SchedulerWorker* worker,
209 const TimeDelta& detach_duration) override; 209 const TimeDelta& detach_duration) override;
210 scoped_refptr<Sequence> GetWork(SchedulerWorker* worker) override; 210 scoped_refptr<Sequence> GetWork(SchedulerWorker* worker) override;
211 void ReEnqueueSequence(scoped_refptr<Sequence> sequence) override; 211 void ReEnqueueSequence(scoped_refptr<Sequence> sequence) override;
212 TimeDelta GetSleepTimeout() override; 212 TimeDelta GetSleepTimeout() override;
213 bool CanDetach(SchedulerWorker* worker) override; 213 bool CanDetach(SchedulerWorker* worker) override;
214 214
215 void RegisterSingleThreadTaskRunner() { 215 void RegisterSingleThreadTaskRunner() {
216 subtle::Barrier_AtomicIncrement(&num_single_threaded_runners_, 1); 216 // No barrier as barriers only affect sequential consistency which is
217 // irrelevant in a single variable use case (they don't force an immediate
218 // flush anymore than atomics do by default).
219 subtle::NoBarrier_AtomicIncrement(&num_single_threaded_runners_, 1);
217 } 220 }
218 221
219 void UnregisterSingleThreadTaskRunner() { 222 void UnregisterSingleThreadTaskRunner() {
220 subtle::Barrier_AtomicIncrement(&num_single_threaded_runners_, -1); 223 subtle::NoBarrier_AtomicIncrement(&num_single_threaded_runners_, -1);
221 } 224 }
222 225
223 private: 226 private:
224 SchedulerWorkerPoolImpl* outer_; 227 SchedulerWorkerPoolImpl* outer_;
225 const ReEnqueueSequenceCallback re_enqueue_sequence_callback_; 228 const ReEnqueueSequenceCallback re_enqueue_sequence_callback_;
226 229
227 // Single-threaded PriorityQueue for the worker. 230 // Single-threaded PriorityQueue for the worker.
228 PriorityQueue single_threaded_priority_queue_; 231 PriorityQueue single_threaded_priority_queue_;
229 232
230 // True if the last Sequence returned by GetWork() was extracted from 233 // True if the last Sequence returned by GetWork() was extracted from
(...skipping 302 matching lines...) Expand 10 before | Expand all | Expand 10 after
533 } 536 }
534 537
535 TimeDelta SchedulerWorkerPoolImpl::SchedulerWorkerDelegateImpl:: 538 TimeDelta SchedulerWorkerPoolImpl::SchedulerWorkerDelegateImpl::
536 GetSleepTimeout() { 539 GetSleepTimeout() {
537 return outer_->suggested_reclaim_time_; 540 return outer_->suggested_reclaim_time_;
538 } 541 }
539 542
540 bool SchedulerWorkerPoolImpl::SchedulerWorkerDelegateImpl::CanDetach( 543 bool SchedulerWorkerPoolImpl::SchedulerWorkerDelegateImpl::CanDetach(
541 SchedulerWorker* worker) { 544 SchedulerWorker* worker) {
542 // It's not an issue if |num_single_threaded_runners_| is incremented after 545 // It's not an issue if |num_single_threaded_runners_| is incremented after
543 // this because the newly created TaskRunner (from which no task has run yet) 546 // this because the newly created SingleThreadTaskRunner (from which no task
544 // will simply run all its tasks on the next physical thread created by the 547 // has run yet) will simply run all its tasks on the next physical thread
545 // worker. 548 // created by the worker.
546 const bool can_detach = 549 const bool can_detach =
547 !idle_start_time_.is_null() && 550 !idle_start_time_.is_null() &&
548 (TimeTicks::Now() - idle_start_time_) > outer_->suggested_reclaim_time_ && 551 (TimeTicks::Now() - idle_start_time_) > outer_->suggested_reclaim_time_ &&
549 worker != outer_->PeekAtIdleWorkersStack() && 552 worker != outer_->PeekAtIdleWorkersStack() &&
550 !subtle::Acquire_Load(&num_single_threaded_runners_) && 553 !subtle::NoBarrier_Load(&num_single_threaded_runners_) &&
551 outer_->CanWorkerDetachForTesting(); 554 outer_->CanWorkerDetachForTesting();
552 return can_detach; 555 return can_detach;
553 } 556 }
554 557
555 SchedulerWorkerPoolImpl::SchedulerWorkerPoolImpl( 558 SchedulerWorkerPoolImpl::SchedulerWorkerPoolImpl(
556 StringPiece name, 559 StringPiece name,
557 SchedulerWorkerPoolParams::IORestriction io_restriction, 560 SchedulerWorkerPoolParams::IORestriction io_restriction,
558 const TimeDelta& suggested_reclaim_time, 561 const TimeDelta& suggested_reclaim_time,
559 TaskTracker* task_tracker, 562 TaskTracker* task_tracker,
560 DelayedTaskManager* delayed_task_manager) 563 DelayedTaskManager* delayed_task_manager)
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
646 AutoSchedulerLock auto_lock(idle_workers_stack_lock_); 649 AutoSchedulerLock auto_lock(idle_workers_stack_lock_);
647 idle_workers_stack_.Remove(worker); 650 idle_workers_stack_.Remove(worker);
648 } 651 }
649 652
650 bool SchedulerWorkerPoolImpl::CanWorkerDetachForTesting() { 653 bool SchedulerWorkerPoolImpl::CanWorkerDetachForTesting() {
651 return !worker_detachment_disallowed_.IsSet(); 654 return !worker_detachment_disallowed_.IsSet();
652 } 655 }
653 656
654 } // namespace internal 657 } // namespace internal
655 } // namespace base 658 } // namespace base
OLDNEW
« no previous file with comments | « base/message_loop/message_loop.cc ('k') | base/task_scheduler/task_tracker.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698