]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
msg: make last_keepalive[_ack] lock safe
authorSage Weil <sage@redhat.com>
Tue, 6 Oct 2015 19:10:02 +0000 (15:10 -0400)
committerSage Weil <sage@redhat.com>
Mon, 23 Nov 2015 13:38:48 +0000 (08:38 -0500)
Signed-off-by: Sage Weil <sage@redhat.com>
src/msg/Connection.h

index d54b7d6e7eff8316efb87c8bd1b08e1ed95fe781..2362895e256b22039a22ae5a6e6c387d47eb377a 100644 (file)
@@ -39,7 +39,7 @@ class Message;
 class Messenger;
 
 struct Connection : public RefCountedObject {
-  Mutex lock;
+  mutable Mutex lock;
   Messenger *msgr;
   RefCountedObject *priv;
   int peer_type;
@@ -179,15 +179,19 @@ public:
   }
 
   utime_t get_last_keepalive() const {
+    Mutex::Locker l(lock);
     return last_keepalive;
   }
   void set_last_keepalive(utime_t t) {
+    Mutex::Locker l(lock);
     last_keepalive = t;
   }
   utime_t get_last_keepalive_ack() const {
+    Mutex::Locker l(lock);
     return last_keepalive_ack;
   }
   void set_last_keepalive_ack(utime_t t) {
+    Mutex::Locker l(lock);
     last_keepalive_ack = t;
   }