Pipe: rename keepalive->send_keepalive

Signed-off-by: Greg Farnum <greg@inktank.com>
(cherry picked from commit 38d4c71a456c1cc9a5044dbcae5378836a34484d)

diff --git a/src/msg/Pipe.cc b/src/msg/Pipe.cc
index bdfc89fe7c8b37a940b7417ce7a6c5a0934f637f..994a4cc13ca0d4989db5c6ef509fb1da142b198c 100644 (file)
--- a/src/msg/Pipe.cc
+++ b/src/msg/Pipe.cc
@@ -68,7 +68,7 @@ Pipe::Pipe(SimpleMessenger *r, int st, Connection *con)
     reader_running(false), reader_needs_join(false),
     writer_running(false),
     in_q(&(r->dispatch_queue)),
-    keepalive(false),
+    send_keepalive(false),
     close_on_empty(false),
     connect_seq(0), peer_global_seq(0),
     out_seq(0), in_seq(0), in_seq_acked(0) {
@@ -1528,7 +1528,7 @@ void Pipe::writer()
        (is_queued() || in_seq > in_seq_acked)) {
 
       // keepalive?
-      if (keepalive) {
+      if (send_keepalive) {
        pipe_lock.Unlock();
        int rc = write_keepalive();
        pipe_lock.Lock();
@@ -1537,7 +1537,7 @@ void Pipe::writer()
          fault();
          continue;
        }
-       keepalive = false;
+       send_keepalive = false;
       }
 
       // send ack?

diff --git a/src/msg/Pipe.h b/src/msg/Pipe.h
index 5f94305350c3ed2a8185accc505a313187160f37..d2f9c49257350fc493bd0be5d70d5a5b42effefa 100644 (file)
--- a/src/msg/Pipe.h
+++ b/src/msg/Pipe.h
@@ -161,7 +161,7 @@ class DispatchQueue;
     DispatchQueue *in_q;
     list<Message*> sent;
     Cond cond;
-    bool keepalive;
+    bool send_keepalive;
     bool halt_delivery; //if a pipe's queue is destroyed, stop adding to it
     bool close_on_empty;
     
@@ -218,7 +218,7 @@ class DispatchQueue;
 
     __u32 get_out_seq() { return out_seq; }
 
-    bool is_queued() { return !out_q.empty() || keepalive; }
+    bool is_queued() { return !out_q.empty() || send_keepalive; }
 
     entity_addr_t& get_peer_addr() { return peer_addr; }
 
@@ -253,7 +253,7 @@ class DispatchQueue;
     }
     void _send_keepalive() {
       assert(pipe_lock.is_locked());
-      keepalive = true;
+      send_keepalive = true;
       cond.Signal();
     }
     Message *_get_next_outgoing() {