From ae4e9784fb413f8286dcf42c4909dbd7b1ef9e82 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Tue, 17 Nov 2009 14:11:24 -0800
Subject: [PATCH] msgr: use discard_queue, kill drop_msgs

---
 src/msg/SimpleMessenger.cc | 18 +++---------------
 src/msg/SimpleMessenger.h  |  2 --
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/src/msg/SimpleMessenger.cc b/src/msg/SimpleMessenger.cc
index 6015e19247cc9..c7e4da930a6ea 100644
--- a/src/msg/SimpleMessenger.cc
+++ b/src/msg/SimpleMessenger.cc
@@ -1174,8 +1174,8 @@ void SimpleMessenger::Pipe::fail()
 
   stop();
 
-  drop_msgs();
-
+  discard_queue();
+  
   for (unsigned i=0; i<rank->local.size(); i++) 
     if (rank->local[i])
       rank->local[i]->queue_reset(connection_state->get());
@@ -1186,7 +1186,7 @@ void SimpleMessenger::Pipe::was_session_reset()
   assert(lock.is_locked());
 
   dout(10) << "was_session_reset" << dendl;
-  drop_msgs();
+  discard_queue();
 
   for (unsigned i=0; i<rank->local.size(); i++) 
     if (rank->local[i])
@@ -1197,18 +1197,6 @@ void SimpleMessenger::Pipe::was_session_reset()
   connect_seq = 0;
 }
 
-void SimpleMessenger::Pipe::drop_msgs()
-{
-  assert(lock.is_locked());
-
-  while (1) {
-    Message *m = _get_next_outgoing();
-    if (!m)
-      break;
-    m->put();
-  }
-}
-
 void SimpleMessenger::Pipe::stop()
 {
   dout(10) << "stop" << dendl;
diff --git a/src/msg/SimpleMessenger.h b/src/msg/SimpleMessenger.h
index e27ec75a28720..9884a9b60cb5d 100644
--- a/src/msg/SimpleMessenger.h
+++ b/src/msg/SimpleMessenger.h
@@ -134,8 +134,6 @@ private:
 
     void was_session_reset();
 
-    void drop_msgs();
-
     // threads
     class Reader : public Thread {
       Pipe *pipe;
-- 
2.39.5