commit cfd0ff890ce90d6b5e6d58e4f47bbdbef5e3d669
author Steve Kim <kwstephenkim@google.com> Wed Nov 09 17:54:56 2022 -0800
committer Steve Kim <kwstephenkim@google.com> Tue Nov 15 13:59:46 2022 -0800
tree 843bda28f953391e6aff5dab2a5dfbaf3b58c648
parent 166efacb5f167dd4360e6559f636588e603bd628

Use Contains() in unique resource allocator

Use Contains() in unique resource allocator.

Bug: 258525421
Test: Run locally
Change-Id: If35921ad7301df1434aec6e7d4d922f91a87522c

host/commands/cvd/selector/unique_resource_allocator.h

diff --git a/host/commands/cvd/selector/unique_resource_allocator.h b/host/commands/cvd/selector/unique_resource_allocator.h
index ae20080..5cc8502 100644
--- a/host/commands/cvd/selector/unique_resource_allocator.h
+++ b/host/commands/cvd/selector/unique_resource_allocator.h
@@ -25,6 +25,8 @@
 #include <unordered_set>
 #include <vector>
 
+#include "common/libs/utils/contains.h"
+
 namespace cuttlefish {
 namespace selector {
 
@@ -155,8 +157,8 @@
 bool UniqueResourceAllocator<T>::ReclaimAll(const Container& items) {
   std::lock_guard<std::mutex> lock(mutex_);
   for (const auto& i : items) {
-    if (allocated_resources_.find(i) == allocated_resources_.end() &&
-        available_resources_.find(i) == available_resources_.end()) {
+    if (!Contains(allocated_resources_, i) &&
+        !Contains(available_resources_, i)) {
       return false;
     }
     allocated_resources_.erase(i);
@@ -168,8 +170,8 @@
 template <typename T>
 bool UniqueResourceAllocator<T>::Reclaim(const T& t) {
   std::lock_guard<std::mutex> lock(mutex_);
-  if (allocated_resources_.find(t) == allocated_resources_.end() &&
-      available_resources_.find(t) == available_resources_.end()) {
+  if (!Contains(allocated_resources_, t) &&
+      !Contains(available_resources_, t)) {
     return false;
   }
   allocated_resources_.erase(t);
@@ -180,7 +182,7 @@
 template <typename T>
 bool UniqueResourceAllocator<T>::Take(const T& t) {
   std::lock_guard<std::mutex> lock(mutex_);
-  if (available_resources_.find(t) == available_resources_.end()) {
+  if (!Contains(available_resources_, t)) {
     return false;
   }
   available_resources_.erase(t);
@@ -193,7 +195,7 @@
 bool UniqueResourceAllocator<T>::TakeAll(const Container& ts) {
   std::lock_guard<std::mutex> lock(mutex_);
   for (const auto& t : ts) {
-    if (available_resources_.find(t) == available_resources_.end()) {
+    if (!Contains(available_resources_, t)) {
       return false;
     }
   }
@@ -221,7 +223,7 @@
                                               const T& end_exclusive) {
   static_assert(std::is_same<T, V>::value);
   for (auto cursor = start_inclusive; cursor < end_exclusive; cursor++) {
-    if (available_resources_.find(cursor) == available_resources_.end()) {
+    if (!Contains(available_resources_, cursor)) {
       return false;
     }
   }