From 03db8801b1b429555ebbdff981f7b5ff6b5e85a1 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 16 Oct 2018 13:44:16 -0500 Subject: [PATCH] common/TracepointProvider: Mutex -> ceph::mutex Signed-off-by: Sage Weil --- src/common/TracepointProvider.cc | 6 +++--- src/common/TracepointProvider.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/common/TracepointProvider.cc b/src/common/TracepointProvider.cc index 8a9b1e6a964..38529f3df02 100644 --- a/src/common/TracepointProvider.cc +++ b/src/common/TracepointProvider.cc @@ -6,8 +6,8 @@ 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_cct(cct), m_library(library), m_config_keys{config_key, NULL} +{ m_cct->_conf.add_observer(this); verify_config(m_cct->_conf); } @@ -27,7 +27,7 @@ void TracepointProvider::handle_conf_change( } void TracepointProvider::verify_config(const ConfigProxy& conf) { - std::lock_guard locker(m_lock); + std::lock_guard locker(m_lock); if (m_handle) { return; } diff --git a/src/common/TracepointProvider.h b/src/common/TracepointProvider.h index 644a05b540c..30e290600a5 100644 --- a/src/common/TracepointProvider.h +++ b/src/common/TracepointProvider.h @@ -6,7 +6,7 @@ #include "common/ceph_context.h" #include "common/config_obs.h" -#include "common/Mutex.h" +#include "common/ceph_mutex.h" #include class TracepointProvider : public md_config_obs_t { @@ -73,7 +73,7 @@ private: std::string m_library; mutable const char* m_config_keys[2]; - Mutex m_lock; + ceph::mutex m_lock = ceph::make_mutex("TracepointProvider::m_lock"); void* m_handle = nullptr; void verify_config(const ConfigProxy& conf); -- 2.39.5