Merge pull request #12652 from badone/wip-coverity-TracepointProvider

tracing: Fix handle leak in TracepointProvider Reviewed-by: Jason Dillaman <dillaman@redhat.com>
ceph · Dec 30, 2016 · 874aed6 · 874aed6
2 parents 9088f47 + 756c201
commit 874aed6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/common/TracepointProvider.cc b/src/common/TracepointProvider.cc
@@ -7,13 +7,16 @@
 TracepointProvider::TracepointProvider(CephContext *cct, const char *library,
                                        const char *config_key)
   : m_cct(cct), m_library(library), m_config_keys{config_key, NULL},
-    m_lock("TracepointProvider::m_lock"), m_enabled(false) {
+    m_lock("TracepointProvider::m_lock") {
   m_cct->_conf->add_observer(this);
   verify_config(m_cct->_conf);
 }
 
 TracepointProvider::~TracepointProvider() {
   m_cct->_conf->remove_observer(this);
+  if (m_handle) {
+    dlclose(m_handle);
+  }
 }
 
 void TracepointProvider::handle_conf_change(
@@ -25,7 +28,7 @@ void TracepointProvider::handle_conf_change(
 
 void TracepointProvider::verify_config(const struct md_config_t *conf) {
   Mutex::Locker locker(m_lock);
-  if (m_enabled) {
+  if (m_handle) {
     return;
   }
 
@@ -36,9 +39,6 @@ void TracepointProvider::verify_config(const struct md_config_t *conf) {
     return;
   }
 
-  void *handle = dlopen(m_library.c_str(), RTLD_NOW);
-  if (handle != NULL) {
-    m_enabled = true;
-  }
+  m_handle = dlopen(m_library.c_str(), RTLD_NOW);
 }
 
diff --git a/src/common/TracepointProvider.h b/src/common/TracepointProvider.h
@@ -36,7 +36,7 @@ class TracepointProvider : public md_config_obs_t, boost::noncopyable {
     }
 
     inline bool is_enabled() const {
-      return tracepoint_provider->m_enabled;
+      return tracepoint_provider->m_handle != nullptr;
     }
   private:
     TracepointProvider *tracepoint_provider;
@@ -75,7 +75,7 @@ class TracepointProvider : public md_config_obs_t, boost::noncopyable {
   mutable const char* m_config_keys[2];
 
   Mutex m_lock;
-  bool m_enabled;
+  void* m_handle = nullptr;
 
   void verify_config(const struct md_config_t *conf);
 };