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

Side by Side Diff: webrtc/rtc_base/thread_checker.h

Issue 3004393002: Rename thread annotation macros to have RTC prefix for syncrhonization primitives. (Closed)
Patch Set: Created 3 years, 3 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 /* 1 /*
2 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 // RTC_DCHECK(thread_checker_.CalledOnValidThread()); 64 // RTC_DCHECK(thread_checker_.CalledOnValidThread());
65 // ... (do stuff) ... 65 // ... (do stuff) ...
66 // } 66 // }
67 // 67 //
68 // private: 68 // private:
69 // ThreadChecker thread_checker_; 69 // ThreadChecker thread_checker_;
70 // } 70 // }
71 // 71 //
72 // In Release mode, CalledOnValidThread will always return true. 72 // In Release mode, CalledOnValidThread will always return true.
73 #if ENABLE_THREAD_CHECKER 73 #if ENABLE_THREAD_CHECKER
74 class LOCKABLE ThreadChecker : public ThreadCheckerImpl { 74 class RTC_LOCKABLE ThreadChecker : public ThreadCheckerImpl {};
75 };
76 #else 75 #else
77 class LOCKABLE ThreadChecker : public ThreadCheckerDoNothing { 76 class RTC_LOCKABLE ThreadChecker : public ThreadCheckerDoNothing {};
78 };
79 #endif // ENABLE_THREAD_CHECKER 77 #endif // ENABLE_THREAD_CHECKER
80 78
81 #undef ENABLE_THREAD_CHECKER 79 #undef ENABLE_THREAD_CHECKER
82 80
83 namespace internal { 81 namespace internal {
84 class SCOPED_LOCKABLE AnnounceOnThread { 82 class RTC_SCOPED_LOCKABLE AnnounceOnThread {
85 public: 83 public:
86 template<typename ThreadLikeObject> 84 template <typename ThreadLikeObject>
87 explicit AnnounceOnThread(const ThreadLikeObject* thread_like_object) 85 explicit AnnounceOnThread(const ThreadLikeObject* thread_like_object)
88 EXCLUSIVE_LOCK_FUNCTION(thread_like_object) {} 86 RTC_EXCLUSIVE_LOCK_FUNCTION(thread_like_object) {}
89 ~AnnounceOnThread() UNLOCK_FUNCTION() {} 87 ~AnnounceOnThread() RTC_UNLOCK_FUNCTION() {}
90 88
91 template<typename ThreadLikeObject> 89 template<typename ThreadLikeObject>
92 static bool IsCurrent(const ThreadLikeObject* thread_like_object) { 90 static bool IsCurrent(const ThreadLikeObject* thread_like_object) {
93 return thread_like_object->IsCurrent(); 91 return thread_like_object->IsCurrent();
94 } 92 }
95 static bool IsCurrent(const rtc::ThreadChecker* checker) { 93 static bool IsCurrent(const rtc::ThreadChecker* checker) {
96 return checker->CalledOnValidThread(); 94 return checker->CalledOnValidThread();
97 } 95 }
98 96
99 private: 97 private:
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 // rtc::scoped_ref_ptr<Encoder> encoder = encoder_; 157 // rtc::scoped_ref_ptr<Encoder> encoder = encoder_;
160 // encoder_->Queue()->PostTask([encoder] { encoder->Encode(); }); 158 // encoder_->Queue()->PostTask([encoder] { encoder->Encode(); });
161 // } 159 // }
162 // 160 //
163 // private: 161 // private:
164 // rtc::scoped_ref_ptr<Encoder> encoder_; 162 // rtc::scoped_ref_ptr<Encoder> encoder_;
165 // } 163 // }
166 164
167 // Document if a variable/field is not shared and should be accessed from 165 // Document if a variable/field is not shared and should be accessed from
168 // same thread/task queue. 166 // same thread/task queue.
169 #define ACCESS_ON(x) THREAD_ANNOTATION_ATTRIBUTE__(guarded_by(x)) 167 #define ACCESS_ON(x) RTC_THREAD_ANNOTATION_ATTRIBUTE__(guarded_by(x))
170 168
171 // Document if a function expected to be called from same thread/task queue. 169 // Document if a function expected to be called from same thread/task queue.
172 #define RUN_ON(x) THREAD_ANNOTATION_ATTRIBUTE__(exclusive_locks_required(x)) 170 #define RUN_ON(x) RTC_THREAD_ANNOTATION_ATTRIBUTE__(exclusive_locks_required(x))
173 171
174 #define RTC_DCHECK_RUN_ON(thread_like_object) \ 172 #define RTC_DCHECK_RUN_ON(thread_like_object) \
175 rtc::internal::AnnounceOnThread thread_announcer(thread_like_object); \ 173 rtc::internal::AnnounceOnThread thread_announcer(thread_like_object); \
176 RTC_DCHECK(rtc::internal::AnnounceOnThread::IsCurrent(thread_like_object)) 174 RTC_DCHECK(rtc::internal::AnnounceOnThread::IsCurrent(thread_like_object))
177 175
178 #endif // WEBRTC_RTC_BASE_THREAD_CHECKER_H_ 176 #endif // WEBRTC_RTC_BASE_THREAD_CHECKER_H_
OLDNEW
« no previous file with comments | « webrtc/rtc_base/thread_annotations_unittest.cc ('k') | webrtc/system_wrappers/include/rw_lock_wrapper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698