update sources to ceph Nautilus 14.2.1

[ceph.git] / ceph / src / common / TracepointProvider.cc

diff --git a/ceph/src/common/TracepointProvider.cc b/ceph/src/common/TracepointProvider.cc
index f96c50d1b0be7ed1f9317f4dc433453877b8ce22..38529f3df02dc2565319ce04c8c06ae319195d6a 100644 (file)
--- a/ceph/src/common/TracepointProvider.cc
+++ b/ceph/src/common/TracepointProvider.cc
@@ -6,40 +6,40 @@
 
 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->_conf->add_observer(this);
+  : m_cct(cct), m_library(library), m_config_keys{config_key, NULL}
+{
+  m_cct->_conf.add_observer(this);
   verify_config(m_cct->_conf);
 }
 
 TracepointProvider::~TracepointProvider() {
-  m_cct->_conf->remove_observer(this);
+  m_cct->_conf.remove_observer(this);
   if (m_handle) {
     dlclose(m_handle);
   }
 }
 
 void TracepointProvider::handle_conf_change(
-    const struct md_config_t *conf, const std::set<std::string> &changed) {
+    const ConfigProxy& conf, const std::set<std::string> &changed) {
   if (changed.count(m_config_keys[0])) {
     verify_config(conf);
   }
 }
 
-void TracepointProvider::verify_config(const struct md_config_t *conf) {
-  Mutex::Locker locker(m_lock);
+void TracepointProvider::verify_config(const ConfigProxy& conf) {
+  std::lock_guard locker(m_lock);
   if (m_handle) {
     return;
   }
 
   char buf[10];
   char *pbuf = buf;
-  if (conf->get_val(m_config_keys[0], &pbuf, sizeof(buf)) != 0 ||
+  if (conf.get_val(m_config_keys[0], &pbuf, sizeof(buf)) != 0 ||
       strncmp(buf, "true", 5) != 0) {
     return;
   }
 
   m_handle = dlopen(m_library.c_str(), RTLD_NOW | RTLD_NODELETE);
-  assert(m_handle);
+  ceph_assert(m_handle);
 }