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

am: c0bc2616c4 Change-Id: Ic79043ca9243c7a3439733b00063906dcc7f2e4a
2018-01-11 17:59:45 +00:00 · 2018-01-11 17:59:45 +00:00 · cef2b78e6a
parent f2e90d9eaf c0bc2616c4
commit cef2b78e6a
1 changed files with 6 additions and 0 deletions
--- 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__))