diff --git a/webrtc/base/thread_annotations.h b/webrtc/base/thread_annotations.h index d49feb7da6..612242d611 100644 --- a/webrtc/base/thread_annotations.h +++ b/webrtc/base/thread_annotations.h @@ -32,9 +32,6 @@ // is primarily used when the client cannot express the name of the lock. #define GUARDED_BY(x) THREAD_ANNOTATION_ATTRIBUTE__(guarded_by(x)) #define GUARDED_VAR THREAD_ANNOTATION_ATTRIBUTE__(guarded) -// Document if a variable/field is not shared and should be accessed from -// same thread/task queue. -#define ACCESS_ON(x) THREAD_ANNOTATION_ATTRIBUTE__(guarded_by(x)) // Document if the memory location pointed to by a pointer should be guarded // by a lock when dereferencing the pointer. Similar to GUARDED_VAR, @@ -61,8 +58,6 @@ // Document if a function expects certain locks to be held before it is called #define EXCLUSIVE_LOCKS_REQUIRED(...) \ THREAD_ANNOTATION_ATTRIBUTE__(exclusive_locks_required(__VA_ARGS__)) -// Document if a function expected to be called from same thread/task queue. -#define RUN_ON(x) THREAD_ANNOTATION_ATTRIBUTE__(exclusive_locks_required(x)) #define SHARED_LOCKS_REQUIRED(...) \ THREAD_ANNOTATION_ATTRIBUTE__(shared_locks_required(__VA_ARGS__)) diff --git a/webrtc/base/thread_checker.h b/webrtc/base/thread_checker.h index 265b2affcb..3ae6e2c9f7 100644 --- a/webrtc/base/thread_checker.h +++ b/webrtc/base/thread_checker.h @@ -173,6 +173,13 @@ class SCOPED_LOCKABLE AnnounceOnThread { // rtc::scoped_ref_ptr encoder_; // } +// Document if a variable/field is not shared and should be accessed from +// same thread/task queue. +#define ACCESS_ON(x) THREAD_ANNOTATION_ATTRIBUTE__(guarded_by(x)) + +// Document if a function expected to be called from same thread/task queue. +#define RUN_ON(x) THREAD_ANNOTATION_ATTRIBUTE__(exclusive_locks_required(x)) + #define RTC_DCHECK_RUN_ON(thread_like_object) \ rtc::internal::AnnounceOnThread thread_announcer(thread_like_object); \ RTC_DCHECK(rtc::internal::AnnounceOnThread::IsCurrent(thread_like_object))