From: Sage Weil <sage@inktank.com>
Date: Sat, 17 Nov 2012 22:21:07 +0000 (-0800)
Subject: mon: clean up Subsription xlists
X-Git-Tag: v0.55~76^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3e2eb3a16bed09ac6692386857a2b1292dd64c68;p=ceph.git

mon: clean up Subsription xlists

Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/mon/Session.h b/src/mon/Session.h
index 685fc8e8fac4b..edf5d66ef6fa7 100644
--- a/src/mon/Session.h
+++ b/src/mon/Session.h
@@ -80,6 +80,15 @@ struct MonSessionMap {
   map<string, xlist<Subscription*>* > subs;
   multimap<int, MonSession*> by_osd;
 
+  MonSessionMap() {}
+  ~MonSessionMap() {
+    while (!subs.empty()) {
+      assert(subs.begin()->second->empty());
+      delete subs.begin()->second;
+      subs.erase(subs.begin());
+    }
+  }
+
   void remove_session(MonSession *s) {
     assert(!s->closed);
     for (map<string,Subscription*>::iterator p = s->sub_map.begin(); p != s->sub_map.end(); ++p) {