Convert to use libbase ScopedLockAssertion
am: 411ea7f258
Change-Id: I14017e4c003087044ed212dcd1b3f30fa9ab7784
diff --git a/res_cache.cpp b/res_cache.cpp
index 5dc2c82..4688f0e 100644
--- a/res_cache.cpp
+++ b/res_cache.cpp
@@ -902,14 +902,6 @@
std::unordered_map<int, uint32_t> dns_event_subsampling_map;
};
-// A helper class for the Clang Thread Safety Analysis to deal with
-// std::unique_lock.
-class SCOPED_CAPABILITY ScopedAssumeLocked {
- public:
- explicit ScopedAssumeLocked(std::mutex& mutex) ACQUIRE(mutex) {}
- ~ScopedAssumeLocked() RELEASE() {}
-};
-
// lock protecting everything in the resolve_cache_info structs (next ptr, etc)
static std::mutex cache_mutex;
static std::condition_variable cv;
@@ -1175,7 +1167,7 @@
}
/* lookup cache */
std::unique_lock lock(cache_mutex);
- ScopedAssumeLocked assume_lock(cache_mutex);
+ android::base::ScopedLockAssertion assume_lock(cache_mutex);
cache = find_named_cache_locked(netid);
if (cache == nullptr) {
return RESOLV_CACHE_UNSUPPORTED;