From: Kefu Chai <tchaikov@gmail.com>
Date: Thu, 25 Dec 2014 13:44:53 +0000 (+0800)
Subject: AsyncMessenger: fix the leak of file_events
X-Git-Tag: v0.92~91^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e4e1777894b56528fca9e81014ed0be227dffd8a;p=ceph.git

AsyncMessenger: fix the leak of file_events

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
---

diff --git a/src/msg/async/Event.cc b/src/msg/async/Event.cc
index 27f2d7d35383..75676267b6fc 100644
--- a/src/msg/async/Event.cc
+++ b/src/msg/async/Event.cc
@@ -92,9 +92,10 @@ int EventCenter::init(int n)
 
 EventCenter::~EventCenter()
 {
-  if (driver)
-    delete driver;
+  delete driver;
 
+  if (file_events)
+    free(file_events);
   if (notify_receive_fd > 0)
     ::close(notify_receive_fd);
   if (notify_send_fd > 0)
diff --git a/src/msg/async/Event.h b/src/msg/async/Event.h
index a6ff341930fd..7d058964bce3 100644
--- a/src/msg/async/Event.h
+++ b/src/msg/async/Event.h
@@ -128,6 +128,7 @@ class EventCenter {
   EventCenter(CephContext *c):
     cct(c), nevent(0),
     lock("AsyncMessenger::lock"),
+    file_events(NULL),
     driver(NULL), time_event_next_id(0),
     notify_receive_fd(-1), notify_send_fd(-1), net(c), owner(0) {
     last_time = time(NULL);