rgw: migrate atomic_t to std::atomic<>

Signed-off-by: Jesse Williamson <jwilliamson@suse.de>

diff --git a/src/rgw/rgw_loadgen_process.cc b/src/rgw/rgw_loadgen_process.cc
index 23e6fefca73e7d4ea1749f4034ee797792e75605..fef37f805bac9cca414756d006c6344f38089944 100644 (file)
--- a/src/rgw/rgw_loadgen_process.cc
+++ b/src/rgw/rgw_loadgen_process.cc
@@ -39,7 +39,7 @@ void RGWLoadGenProcess::run()
 
   vector<string> buckets(num_buckets);
 
-  std::atomic<long int> failed = { 0 };
+  std::atomic<bool> failed = { false };
 
   for (i = 0; i < num_buckets; i++) {
     buckets[i] = "/loadgen";
@@ -104,7 +104,7 @@ done:
 
 void RGWLoadGenProcess::gen_request(const string& method,
                                    const string& resource,
-                                   int content_length, std::atomic<long int>* fail_flag)
+                                   int content_length, std::atomic<bool>* fail_flag)
 {
   RGWLoadGenRequest* req =
     new RGWLoadGenRequest(store->get_new_req_id(), method, resource,

diff --git a/src/rgw/rgw_object_expirer_core.h b/src/rgw/rgw_object_expirer_core.h
index 6fe8d1410bff0f172038ffb60e2a5fdd9862e56f..813eca3f939a17724dacca94acd93172f76c6f7b 100644 (file)
--- a/src/rgw/rgw_object_expirer_core.h
+++ b/src/rgw/rgw_object_expirer_core.h
@@ -4,11 +4,11 @@
 #ifndef CEPH_OBJEXP_H
 #define CEPH_OBJEXP_H
 
-#include <errno.h>
-#include <iostream>
-#include <sstream>
-#include <string>
 #include <atomic>
+#include <string>
+#include <cerrno>
+#include <sstream>
+#include <iostream>
 
 #include "auth/Crypto.h"
 
@@ -38,8 +38,6 @@
 #include "rgw_usage.h"
 #include "rgw_replica_log.h"
 
-#include <atomic>
-
 class RGWObjectExpirer {
 protected:
   RGWRados *store;

diff --git a/src/rgw/rgw_process.h b/src/rgw/rgw_process.h
index 005f2db6fef742a2562d45e4a881bfbd51805367..3aaeaff61afb818664a5f8f2878485d3927d61a6 100644 (file)
--- a/src/rgw/rgw_process.h
+++ b/src/rgw/rgw_process.h
@@ -184,7 +184,7 @@ public:
   void checkpoint();
   void handle_request(RGWRequest* req) override;
   void gen_request(const string& method, const string& resource,
-                 int content_length, std::atomic<int64_t>* fail_flag);
+                 int content_length, std::atomic<bool>* fail_flag);
 
   void set_access_key(RGWAccessKey& key) { access_key = key; }
 };

diff --git a/src/rgw/rgw_request.h b/src/rgw/rgw_request.h
index 3c835f7b1c94b6c4000639e19598457e4bf1a37b..11345bb0d230851abd6f0fa8e3cd4549f8ecab88 100644 (file)
--- a/src/rgw/rgw_request.h
+++ b/src/rgw/rgw_request.h
@@ -59,10 +59,10 @@ struct RGWLoadGenRequest : public RGWRequest {
        string method;
        string resource;
        int content_length;
-       std::atomic<int64_t>* fail_flag = nullptr;
+       std::atomic<bool>* fail_flag = nullptr;
 
 RGWLoadGenRequest(uint64_t req_id, const string& _m, const  string& _r, int _cl,
-               std::atomic<int64_t> *ff)
+               std::atomic<bool> *ff)
        : RGWRequest(req_id), method(_m), resource(_r), content_length(_cl),
                fail_flag(ff) {}
 };