]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
AsyncMessenger: fix the leak of file_events
authorKefu Chai <tchaikov@gmail.com>
Thu, 25 Dec 2014 13:44:53 +0000 (21:44 +0800)
committerKefu Chai <tchaikov@gmail.com>
Thu, 25 Dec 2014 13:45:00 +0000 (21:45 +0800)
Signed-off-by: Kefu Chai <tchaikov@gmail.com>
src/msg/async/Event.cc
src/msg/async/Event.h

index 27f2d7d3538379889cc61737d00f399ce29839ec..75676267b6fc9881a08b9b9b99090c0366f63689 100644 (file)
@@ -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)
index a6ff341930fd09f7e46715fe6a854e836dedee3c..7d058964bce37bc46a8137fa2a0b8c50d0c4cd48 100644 (file)
@@ -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);