update sources to v12.1.0

[ceph.git] / ceph / src / test / objectstore / TestObjectStoreState.h

diff --git a/ceph/src/test/objectstore/TestObjectStoreState.h b/ceph/src/test/objectstore/TestObjectStoreState.h
index c59d4769113ee76243b763542a1d1601d4ddf88d..7d1ac8c082135a402a3480d2ea75792623ada58c 100644 (file)
--- a/ceph/src/test/objectstore/TestObjectStoreState.h
+++ b/ceph/src/test/objectstore/TestObjectStoreState.h
@@ -65,19 +65,19 @@ public:
   int m_num_objects;
 
   int m_max_in_flight;
-  atomic_t m_in_flight;
+  std::atomic<int> m_in_flight = { 0 };
   Mutex m_finished_lock;
   Cond m_finished_cond;
 
   void wait_for_ready() {
     Mutex::Locker locker(m_finished_lock);
-    while ((m_max_in_flight > 0) && ((int)m_in_flight.read() >= m_max_in_flight))
+    while ((m_max_in_flight > 0) && (m_in_flight >= m_max_in_flight))
       m_finished_cond.Wait(m_finished_lock);
   }
 
   void wait_for_done() {
     Mutex::Locker locker(m_finished_lock);
-    while (m_in_flight.read())
+    while (m_in_flight)
       m_finished_cond.Wait(m_finished_lock);
   }
 
@@ -101,7 +101,6 @@ public:
   explicit TestObjectStoreState(ObjectStore *store) :
     m_next_coll_nr(0), m_num_objs_per_coll(10), m_num_objects(0),
     m_max_in_flight(0), m_finished_lock("Finished Lock"), m_next_pool(1) {
-    m_in_flight.set(0);
     m_store.reset(store);
   }
   ~TestObjectStoreState() { 
@@ -119,11 +118,11 @@ public:
   }
 
   int inc_in_flight() {
-    return ((int) m_in_flight.inc());
+    return ++m_in_flight;
   }
 
   int dec_in_flight() {
-    return ((int) m_in_flight.dec());
+    return --m_in_flight;
   }
 
   coll_entry_t *coll_create(int id);