commit eeca56a762244432bb9ebe201be0f90b6994d237
author Vasily Tarasov <vtarasov@google.com> Thu Jan 11 18:03:16 2018 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jan 11 18:03:16 2018 +0000
tree 46b990f2a5b3a88f3f819009fceb3f1c4a7ce60f
parent a816a1db471f749cd022fa0f78df837fe2a82e49
parent 862b6028c6d1e724abdc37d771f5e3dcd4afa8c3

Merge "Adding per-method clang thread safety annotations" am: 55feb241b1 am: c0bc2616c4
am: cef2b78e6a

Change-Id: I8fc4e19c50c8baeef07680455e020231e25efa6e

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__))