OLD | NEW |
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 Loading... |
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 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
171 | 169 |
172 // Document if a function expected to be called from same thread/task queue. | 170 // Document if a function expected to be called from same thread/task queue. |
173 #define RUN_ON(x) RTC_THREAD_ANNOTATION_ATTRIBUTE__(exclusive_locks_required(x)) | 171 #define RUN_ON(x) RTC_THREAD_ANNOTATION_ATTRIBUTE__(exclusive_locks_required(x)) |
174 #define RTC_RUN_ON(x) RTC_THREAD_ANNOTATION_ATTRIBUTE__(exclusive_locks_required
(x)) | 172 #define RTC_RUN_ON(x) RTC_THREAD_ANNOTATION_ATTRIBUTE__(exclusive_locks_required
(x)) |
175 | 173 |
176 #define RTC_DCHECK_RUN_ON(thread_like_object) \ | 174 #define RTC_DCHECK_RUN_ON(thread_like_object) \ |
177 rtc::internal::AnnounceOnThread thread_announcer(thread_like_object); \ | 175 rtc::internal::AnnounceOnThread thread_announcer(thread_like_object); \ |
178 RTC_DCHECK(rtc::internal::AnnounceOnThread::IsCurrent(thread_like_object)) | 176 RTC_DCHECK(rtc::internal::AnnounceOnThread::IsCurrent(thread_like_object)) |
179 | 177 |
180 #endif // WEBRTC_RTC_BASE_THREAD_CHECKER_H_ | 178 #endif // WEBRTC_RTC_BASE_THREAD_CHECKER_H_ |
OLD | NEW |