commit 55feb241b159a946ad3a24286baec3b8bf43a9e6
author Vasily Tarasov <vtarasov@google.com> Thu Jan 11 17:48:33 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 11 17:48:33 2018 +0000
tree 360058791bd261fb842d93cb87844732f12b8b81
parent eac86b0ea90f19f9a4116e9a1ca401f0959ceb03
parent 713f289dd0e3658819560aeca38483f62d404256

Merge "Adding per-method clang thread safety annotations"

base/include/android-base/thread_annotations.h

diff --git a/base/include/android-base/thread_annotations.h b/base/include/android-base/thread_annotations.h
index fbb5923..1307f0e 100644
--- a/base/include/android-base/thread_annotations.h
+++ b/base/include/android-base/thread_annotations.h
@@ -38,6 +38,12 @@
 #define PT_GUARDED_BY(x) \
       THREAD_ANNOTATION_ATTRIBUTE__(pt_guarded_by(x))
 
+#define EXCLUSIVE_LOCKS_REQUIRED(...) \
+      THREAD_ANNOTATION_ATTRIBUTE__(exclusive_locks_required(__VA_ARGS__))
+
+#define SHARED_LOCKS_REQUIRED(...) \
+      THREAD_ANNOTATION_ATTRIBUTE__(shared_locks_required(__VA_ARGS__))
+
 #define ACQUIRED_BEFORE(...) \
       THREAD_ANNOTATION_ATTRIBUTE__(acquired_before(__VA_ARGS__))