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

Side by Side Diff: base/sequence_checker_impl.cc

Issue 19695005: Revert 211956 "base: Change WeakPtr to use SequenceChecker inste..." (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: message loop header Created 7 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 | Annotate | Revision Log
« no previous file with comments | « base/sequence_checker_impl.h ('k') | base/sequence_checker_impl_unittest.cc » ('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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/sequence_checker_impl.h" 5 #include "base/sequence_checker_impl.h"
6 6
7 #include "base/sequenced_task_runner.h"
8
7 namespace base { 9 namespace base {
8 10
9 SequenceCheckerImpl::SequenceCheckerImpl() 11 SequenceCheckerImpl::SequenceCheckerImpl(
10 : sequence_token_assigned_(false) { 12 const scoped_refptr<SequencedTaskRunner>& sequenced_task_runner)
11 AutoLock auto_lock(lock_); 13 : sequenced_task_runner_(sequenced_task_runner) {}
12 EnsureSequenceTokenAssigned();
13 }
14 14
15 SequenceCheckerImpl::~SequenceCheckerImpl() {} 15 SequenceCheckerImpl::~SequenceCheckerImpl() {}
16 16
17 bool SequenceCheckerImpl::CalledOnValidSequencedThread() const { 17 bool SequenceCheckerImpl::CalledOnValidSequence() const {
18 AutoLock auto_lock(lock_); 18 AutoLock auto_lock(lock_);
19 EnsureSequenceTokenAssigned(); 19 return sequenced_task_runner_.get() ?
20 20 sequenced_task_runner_->RunsTasksOnCurrentThread() :
21 // If this thread is not associated with a SequencedWorkerPool, 21 thread_checker_.CalledOnValidThread();
22 // SequenceChecker behaves as a ThreadChecker. See header for details.
23 if (!sequence_token_.IsValid())
24 return thread_checker_.CalledOnValidThread();
25
26 return sequence_token_.Equals(
27 SequencedWorkerPool::GetSequenceTokenForCurrentThread());
28 } 22 }
29 23
30 void SequenceCheckerImpl::DetachFromSequence() { 24 void SequenceCheckerImpl::ChangeSequence(
25 const scoped_refptr<SequencedTaskRunner>& sequenced_task_runner) {
31 AutoLock auto_lock(lock_); 26 AutoLock auto_lock(lock_);
27 sequenced_task_runner_ = sequenced_task_runner;
32 thread_checker_.DetachFromThread(); 28 thread_checker_.DetachFromThread();
33 sequence_token_assigned_ = false;
34 sequence_token_ = SequencedWorkerPool::SequenceToken();
35 }
36
37 void SequenceCheckerImpl::EnsureSequenceTokenAssigned() const {
38 lock_.AssertAcquired();
39 if (sequence_token_assigned_)
40 return;
41
42 sequence_token_assigned_ = true;
43 sequence_token_ = SequencedWorkerPool::GetSequenceTokenForCurrentThread();
44 } 29 }
45 30
46 } // namespace base 31 } // namespace base
OLDNEW
« no previous file with comments | « base/sequence_checker_impl.h ('k') | base/sequence_checker_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698