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

Side by Side Diff: base/sequence_checker_impl.cc

Issue 2690533002: Remove header dependencies from sequence_checker.h to sequenced_worker_pool.h (Closed)
Patch Set: rebase Created 3 years, 10 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/sequence_checker_impl.h ('k') | no next file » | 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/logging.h" 7 #include "base/logging.h"
8 #include "base/memory/ptr_util.h"
9 #include "base/sequence_token.h"
10 #include "base/threading/sequenced_worker_pool.h"
11 #include "base/threading/thread_checker_impl.h"
8 12
9 namespace base { 13 namespace base {
10 14
11 SequenceCheckerImpl::SequenceCheckerImpl() { 15 class SequenceCheckerImpl::Core {
12 AutoLock auto_lock(lock_); 16 public:
13 EnsureSequenceTokenAssigned(); 17 Core()
14 } 18 : sequence_token_(SequenceToken::GetForCurrentThread()),
19 sequenced_worker_pool_token_(
20 SequencedWorkerPool::GetSequenceTokenForCurrentThread()) {
21 // SequencedWorkerPool doesn't use SequenceToken and code outside of
22 // SequenceWorkerPool doesn't set a SequencedWorkerPool token.
23 DCHECK(!sequence_token_.IsValid() ||
24 !sequenced_worker_pool_token_.IsValid());
25 }
15 26
27 ~Core() = default;
28
29 bool CalledOnValidThread() const {
30 if (sequence_token_.IsValid())
31 return sequence_token_ == SequenceToken::GetForCurrentThread();
32
33 if (sequenced_worker_pool_token_.IsValid()) {
34 return sequenced_worker_pool_token_.Equals(
35 SequencedWorkerPool::GetSequenceTokenForCurrentThread());
36 }
37
38 // SequenceChecker behaves as a ThreadChecker when it is not bound to a
39 // valid sequence token.
40 return thread_checker_.CalledOnValidThread();
41 }
42
43 private:
44 SequenceToken sequence_token_;
45
46 // TODO(gab): Remove this when SequencedWorkerPool is deprecated in favor of
47 // TaskScheduler. crbug.com/622400
48 SequencedWorkerPool::SequenceToken sequenced_worker_pool_token_;
49
50 // Used when |sequenced_worker_pool_token_| and |sequence_token_| are invalid.
51 ThreadCheckerImpl thread_checker_;
52 };
53
54 SequenceCheckerImpl::SequenceCheckerImpl() : core_(MakeUnique<Core>()) {}
16 SequenceCheckerImpl::~SequenceCheckerImpl() = default; 55 SequenceCheckerImpl::~SequenceCheckerImpl() = default;
17 56
18 bool SequenceCheckerImpl::CalledOnValidSequence() const { 57 bool SequenceCheckerImpl::CalledOnValidSequence() const {
19 AutoLock auto_lock(lock_); 58 AutoLock auto_lock(lock_);
20 EnsureSequenceTokenAssigned(); 59 if (!core_)
21 60 core_ = MakeUnique<Core>();
22 if (sequence_token_.IsValid()) 61 return core_->CalledOnValidThread();
23 return sequence_token_ == SequenceToken::GetForCurrentThread();
24
25 if (sequenced_worker_pool_token_.IsValid()) {
26 return sequenced_worker_pool_token_.Equals(
27 SequencedWorkerPool::GetSequenceTokenForCurrentThread());
28 }
29
30 // SequenceChecker behaves as a ThreadChecker when it is not bound to a valid
31 // sequence token.
32 return thread_checker_.CalledOnValidThread();
33 } 62 }
34 63
35 void SequenceCheckerImpl::DetachFromSequence() { 64 void SequenceCheckerImpl::DetachFromSequence() {
36 AutoLock auto_lock(lock_); 65 AutoLock auto_lock(lock_);
37 is_assigned_ = false; 66 core_.reset();
38 sequence_token_ = SequenceToken();
39 sequenced_worker_pool_token_ = SequencedWorkerPool::SequenceToken();
40 thread_checker_.DetachFromThread();
41 }
42
43 void SequenceCheckerImpl::EnsureSequenceTokenAssigned() const {
44 lock_.AssertAcquired();
45 if (is_assigned_)
46 return;
47
48 is_assigned_ = true;
49 sequence_token_ = SequenceToken::GetForCurrentThread();
50 sequenced_worker_pool_token_ =
51 SequencedWorkerPool::GetSequenceTokenForCurrentThread();
52
53 // SequencedWorkerPool doesn't use SequenceToken and code outside of
54 // SequenceWorkerPool doesn't set a SequencedWorkerPool token.
55 DCHECK(!sequence_token_.IsValid() || !sequenced_worker_pool_token_.IsValid());
56 } 67 }
57 68
58 } // namespace base 69 } // namespace base
OLDNEW
« no previous file with comments | « base/sequence_checker_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698