From: Jesse Williamson <jwilliamson@suse.de>
Date: Tue, 2 May 2017 16:27:12 +0000 (-0700)
Subject: messenger: migrate atomic_t to std::atomic<>
X-Git-Tag: ses5-milestone6~8^2~11^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=10b0a79315575e684f5e334a24ef46cbb4d957d4;p=ceph.git

messenger: migrate atomic_t to std::atomic<>

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

diff --git a/src/msg/simple/Pipe.h b/src/msg/simple/Pipe.h
index 5324c108d55c..9dd00d1b48f3 100644
--- a/src/msg/simple/Pipe.h
+++ b/src/msg/simple/Pipe.h
@@ -129,7 +129,7 @@ static const int SM_IOV_MAX = (IOV_MAX >= 1024 ? IOV_MAX / 4 : IOV_MAX);
     
     Mutex pipe_lock;
     int state;
-    atomic_t state_closed; // non-zero iff state = STATE_CLOSED
+    std::atomic<bool> state_closed = { false }; // true iff state = STATE_CLOSED
 
     // session_security handles any signatures or encryptions required for this pipe's msgs. PLR
 
diff --git a/src/msg/simple/SimpleMessenger.h b/src/msg/simple/SimpleMessenger.h
index 9c5f43e89ba8..de546e24f439 100644
--- a/src/msg/simple/SimpleMessenger.h
+++ b/src/msg/simple/SimpleMessenger.h
@@ -322,7 +322,7 @@ private:
     if (p == rank_pipe.end())
       return NULL;
     // see lock cribbing in Pipe::fault()
-    if (p->second->state_closed.read())
+    if (p->second->state_closed)
       return NULL;
     return p->second;
   }
diff --git a/src/msg/xio/XioConnection.h b/src/msg/xio/XioConnection.h
index ce1667940771..cb1d735b10c7 100644
--- a/src/msg/xio/XioConnection.h
+++ b/src/msg/xio/XioConnection.h
@@ -140,7 +140,7 @@ private:
     uint32_t reconnects;
     uint32_t connect_seq, global_seq, peer_global_seq;
     uint64_t in_seq, out_seq_acked; // atomic<uint64_t>, got receipt
-    atomic64_t out_seq; // atomic<uint64_t>
+    std::atomic<uint64_t> out_seq; 
 
     uint32_t flags;
 
@@ -161,11 +161,11 @@ private:
 	flags(FLAG_NONE) {}
 
     uint64_t get_session_state() {
-      return session_state.read();
+      return session_state;
     }
 
     uint64_t get_startup_state() {
-      return startup_state.read();
+      return startup_state;
     }
 
     void set_in_seq(uint64_t seq) {
@@ -173,7 +173,7 @@ private:
     }
 
     uint64_t next_out_seq() {
-      return out_seq.inc();
+      return ++out_seq;
     };
 
     // state machine
@@ -274,7 +274,7 @@ public:
   }
   ostream& conn_prefix(std::ostream *_dout);
 
-  bool is_connected() override { return connected.read(); }
+  bool is_connected() override { return connected; }
 
   int send_message(Message *m) override;
   void send_keepalive() override {send_keepalive_or_ack();}
@@ -288,8 +288,7 @@ public:
 
   XioConnection* get() {
 #if 0
-    int refs = nref.read();
-    cout << "XioConnection::get " << this << " " << refs << std::endl;
+    cout << "XioConnection::get " << this << " " << nref.load() << std::endl;
 #endif
     RefCountedObject::get();
     return this;
@@ -298,8 +297,7 @@ public:
   void put() {
     RefCountedObject::put();
 #if 0
-    int refs = nref.read();
-    cout << "XioConnection::put " << this << " " << refs << std::endl;
+    cout << "XioConnection::put " << this << " " << nref.load() << std::endl;
 #endif
   }
 
@@ -340,9 +338,9 @@ typedef boost::intrusive_ptr<XioConnection> XioConnectionRef;
 class XioLoopbackConnection : public Connection
 {
 private:
-  atomic64_t seq;
+  std::atomic<uint64_t> seq = { 0 };
 public:
-  explicit XioLoopbackConnection(Messenger *m) : Connection(m->cct, m), seq(0)
+  explicit XioLoopbackConnection(Messenger *m) : Connection(m->cct, m)
     {
       const entity_inst_t& m_inst = m->get_myinst();
       peer_addr = m_inst.addr;
@@ -362,7 +360,7 @@ public:
   void mark_disposable() override {}
 
   uint64_t get_seq() {
-    return seq.read();
+    return seq;
   }
 
   uint64_t next_seq() {