perfcounters: clean up interface a bit

No logger_ prefix necessary.

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>

diff --git a/src/common/perf_counters.cc b/src/common/perf_counters.cc
index f059284176ec02d42fd7a80454aaca513c01431a..825711ba9f55b6c9e48f70ea93f83f887963596e 100644 (file)
--- a/src/common/perf_counters.cc
+++ b/src/common/perf_counters.cc
@@ -26,15 +26,13 @@
 
 using std::ostringstream;
 
-PerfCountersCollection::
-PerfCountersCollection(CephContext *cct)
+PerfCountersCollection::PerfCountersCollection(CephContext *cct)
   : m_cct(cct),
     m_lock("PerfCountersCollection")
 {
 }
 
-PerfCountersCollection::
-~PerfCountersCollection()
+PerfCountersCollection::~PerfCountersCollection()
 {
   Mutex::Locker lck(m_lock);
   for (perf_counters_set_t::iterator l = m_loggers.begin();
@@ -44,8 +42,7 @@ PerfCountersCollection::
   m_loggers.clear();
 }
 
-void PerfCountersCollection::
-logger_add(class PerfCounters *l)
+void PerfCountersCollection::add(class PerfCounters *l)
 {
   Mutex::Locker lck(m_lock);
   perf_counters_set_t::iterator i = m_loggers.find(l);
@@ -53,8 +50,7 @@ logger_add(class PerfCounters *l)
   m_loggers.insert(l);
 }
 
-void PerfCountersCollection::
-logger_remove(class PerfCounters *l)
+void PerfCountersCollection::remove(class PerfCounters *l)
 {
   Mutex::Locker lck(m_lock);
   perf_counters_set_t::iterator i = m_loggers.find(l);
@@ -63,8 +59,7 @@ logger_remove(class PerfCounters *l)
   m_loggers.erase(i);
 }
 
-void PerfCountersCollection::
-logger_clear()
+void PerfCountersCollection::clear()
 {
   Mutex::Locker lck(m_lock);
   perf_counters_set_t::iterator i = m_loggers.begin();
@@ -75,8 +70,7 @@ logger_clear()
   }
 }
 
-void PerfCountersCollection::
-write_json_to_buf(std::vector <char> &buffer, bool schema)
+void PerfCountersCollection::write_json_to_buf(std::vector <char> &buffer, bool schema)
 {
   Mutex::Locker lck(m_lock);
   buffer.push_back('{');
@@ -94,13 +88,11 @@ write_json_to_buf(std::vector <char> &buffer, bool schema)
   buffer.push_back('\0');
 }
 
-PerfCounters::
-~PerfCounters()
+PerfCounters::~PerfCounters()
 {
 }
 
-void PerfCounters::
-inc(int idx, uint64_t amt)
+void PerfCounters::inc(int idx, uint64_t amt)
 {
   Mutex::Locker lck(m_lock);
   assert(idx > m_lower_bound);
@@ -113,8 +105,7 @@ inc(int idx, uint64_t amt)
     data.avgcount++;
 }
 
-void PerfCounters::
-set(int idx, uint64_t amt)
+void PerfCounters::set(int idx, uint64_t amt)
 {
   Mutex::Locker lck(m_lock);
   assert(idx > m_lower_bound);
@@ -127,8 +118,7 @@ set(int idx, uint64_t amt)
     data.avgcount++;
 }
 
-uint64_t PerfCounters::
-get(int idx) const
+uint64_t PerfCounters::get(int idx) const
 {
   Mutex::Locker lck(m_lock);
   assert(idx > m_lower_bound);
@@ -139,8 +129,7 @@ get(int idx) const
   return data.u.u64;
 }
 
-void PerfCounters::
-finc(int idx, double amt)
+void PerfCounters::finc(int idx, double amt)
 {
   Mutex::Locker lck(m_lock);
   assert(idx > m_lower_bound);
@@ -153,8 +142,7 @@ finc(int idx, double amt)
     data.avgcount++;
 }
 
-void PerfCounters::
-fset(int idx, double amt)
+void PerfCounters::fset(int idx, double amt)
 {
   Mutex::Locker lck(m_lock);
   assert(idx > m_lower_bound);
@@ -167,8 +155,7 @@ fset(int idx, double amt)
     data.avgcount++;
 }
 
-double PerfCounters::
-fget(int idx) const
+double PerfCounters::fget(int idx) const
 {
   Mutex::Locker lck(m_lock);
   assert(idx > m_lower_bound);
@@ -187,8 +174,7 @@ static inline void append_to_vector(std::vector <char> &buffer, char *buf)
   memcpy(&buffer[sz], buf, strlen_buf);
 }
 
-void PerfCounters::
-write_json_to_buf(std::vector <char> &buffer, bool schema)
+void PerfCounters::write_json_to_buf(std::vector <char> &buffer, bool schema)
 {
   char buf[512];
   Mutex::Locker lck(m_lock);
@@ -218,14 +204,12 @@ write_json_to_buf(std::vector <char> &buffer, bool schema)
   buffer.push_back('}');
 }
 
-const std::string &PerfCounters::
-get_name() const
+const std::string &PerfCounters::get_name() const
 {
   return m_name;
 }
 
-PerfCounters::
-PerfCounters(CephContext *cct, const std::string &name,
+PerfCounters::PerfCounters(CephContext *cct, const std::string &name,
           int lower_bound, int upper_bound)
   : m_cct(cct),
     m_lower_bound(lower_bound),
@@ -237,8 +221,7 @@ PerfCounters(CephContext *cct, const std::string &name,
   m_data.resize(upper_bound - lower_bound - 1);
 }
 
-PerfCounters::perf_counter_data_any_d::
-perf_counter_data_any_d()
+PerfCounters::perf_counter_data_any_d::perf_counter_data_any_d()
   : name(NULL),
     type(PERFCOUNTER_NONE),
     avgcount(0)
@@ -246,14 +229,12 @@ perf_counter_data_any_d()
   memset(&u, 0, sizeof(u));
 }
 
-void  PerfCounters::perf_counter_data_any_d::
-write_schema_json(char *buf, size_t buf_sz) const
+void  PerfCounters::perf_counter_data_any_d::write_schema_json(char *buf, size_t buf_sz) const
 {
   snprintf(buf, buf_sz, "\"%s\":{\"type\":%d}", name, type);
 }
 
-void  PerfCounters::perf_counter_data_any_d::
-write_json(char *buf, size_t buf_sz) const
+void  PerfCounters::perf_counter_data_any_d::write_json(char *buf, size_t buf_sz) const
 {
   if (type & PERFCOUNTER_LONGRUNAVG) {
     if (type & PERFCOUNTER_U64) {
@@ -284,47 +265,40 @@ write_json(char *buf, size_t buf_sz) const
   }
 }
 
-PerfCountersBuilder::
-PerfCountersBuilder(CephContext *cct, const std::string &name,
+PerfCountersBuilder::PerfCountersBuilder(CephContext *cct, const std::string &name,
                   int first, int last)
   : m_perf_counters(new PerfCounters(cct, name, first, last))
 {
 }
 
-PerfCountersBuilder::
-~PerfCountersBuilder()
+PerfCountersBuilder::~PerfCountersBuilder()
 {
   if (m_perf_counters)
     delete m_perf_counters;
   m_perf_counters = NULL;
 }
 
-void PerfCountersBuilder::
-add_u64_counter(int idx, const char *name)
+void PerfCountersBuilder::add_u64_counter(int idx, const char *name)
 {
   add_impl(idx, name, PERFCOUNTER_U64 | PERFCOUNTER_COUNTER);
 }
 
-void PerfCountersBuilder::
-add_u64(int idx, const char *name)
+void PerfCountersBuilder::add_u64(int idx, const char *name)
 {
   add_impl(idx, name, PERFCOUNTER_U64);
 }
 
-void PerfCountersBuilder::
-add_fl(int idx, const char *name)
+void PerfCountersBuilder::add_fl(int idx, const char *name)
 {
   add_impl(idx, name, PERFCOUNTER_FLOAT);
 }
 
-void PerfCountersBuilder::
-add_fl_avg(int idx, const char *name)
+void PerfCountersBuilder::add_fl_avg(int idx, const char *name)
 {
   add_impl(idx, name, PERFCOUNTER_FLOAT | PERFCOUNTER_LONGRUNAVG);
 }
 
-void PerfCountersBuilder::
-add_impl(int idx, const char *name, int ty)
+void PerfCountersBuilder::add_impl(int idx, const char *name, int ty)
 {
   assert(idx > m_perf_counters->m_lower_bound);
   assert(idx < m_perf_counters->m_upper_bound);
@@ -336,8 +310,7 @@ add_impl(int idx, const char *name, int ty)
   data.avgcount = 0;
 }
 
-PerfCounters *PerfCountersBuilder::
-create_perf_counters()
+PerfCounters *PerfCountersBuilder::create_perf_counters()
 {
   PerfCounters::perf_counter_data_vec_t::const_iterator d = m_perf_counters->m_data.begin();
   PerfCounters::perf_counter_data_vec_t::const_iterator d_end = m_perf_counters->m_data.end();

diff --git a/src/common/perf_counters.h b/src/common/perf_counters.h
index 87292be8ce7a7990557cbb36b376776518928918..f36f67356c9d90834ec23d66c8ab04e8280c2c1a 100644 (file)
--- a/src/common/perf_counters.h
+++ b/src/common/perf_counters.h
@@ -114,9 +114,9 @@ class PerfCountersCollection
 public:
   PerfCountersCollection(CephContext *cct);
   ~PerfCountersCollection();
-  void logger_add(class PerfCounters *l);
-  void logger_remove(class PerfCounters *l);
-  void logger_clear();
+  void add(class PerfCounters *l);
+  void remove(class PerfCounters *l);
+  void clear();
   void write_json_to_buf(std::vector <char> &buffer, bool schema);
 private:
   bool init(const std::string &uri);

diff --git a/src/mds/MDLog.cc b/src/mds/MDLog.cc
index 7e38c088614eb499293f21069822e680859f8a33..2f1528afb47b31a9352428e556e7c1815c804d28 100644 (file)
--- a/src/mds/MDLog.cc
+++ b/src/mds/MDLog.cc
@@ -38,7 +38,7 @@ MDLog::~MDLog()
 {
   if (journaler) { delete journaler; journaler = 0; }
   if (logger) {
-    g_ceph_context->GetPerfCountersCollection()->logger_remove(logger);
+    g_ceph_context->GetPerfCountersCollection()->remove(logger);
     delete logger;
     logger = 0;
   }
@@ -72,7 +72,7 @@ void MDLog::create_logger()
 
   // logger
   logger = plb.create_perf_counters();
-  g_ceph_context->GetPerfCountersCollection()->logger_add(logger);
+  g_ceph_context->GetPerfCountersCollection()->add(logger);
 }
 
 void MDLog::init_journaler()

diff --git a/src/mds/MDS.cc b/src/mds/MDS.cc
index 7a8b34a64bd4d7f33ab4eb170391ac1423ba0e23..4becf6025203d346dbbdd2dd1ab633c3dd5c8046 100644 (file)
--- a/src/mds/MDS.cc
+++ b/src/mds/MDS.cc
@@ -176,12 +176,12 @@ MDS::~MDS() {
   if (objecter) { delete objecter; objecter = 0; }
 
   if (logger) {
-    g_ceph_context->GetPerfCountersCollection()->logger_remove(logger);
+    g_ceph_context->GetPerfCountersCollection()->remove(logger);
     delete logger;
     logger = 0;
   }
   if (mlogger) {
-    g_ceph_context->GetPerfCountersCollection()->logger_remove(logger);
+    g_ceph_context->GetPerfCountersCollection()->remove(logger);
     delete mlogger;
     mlogger = 0;
   }
@@ -257,7 +257,7 @@ void MDS::create_logger()
     mds_plb.add_u64_counter(l_mds_im, "im");
     mds_plb.add_u64_counter(l_mds_iim, "iim");
     logger = mds_plb.create_perf_counters();
-    g_ceph_context->GetPerfCountersCollection()->logger_add(logger);
+    g_ceph_context->GetPerfCountersCollection()->add(logger);
   }
 
   {
@@ -284,7 +284,7 @@ void MDS::create_logger()
     mdm_plb.add_u64(l_mdm_malloc, "malloc");
     mdm_plb.add_u64(l_mdm_buf, "buf");
     mlogger = mdm_plb.create_perf_counters();
-    g_ceph_context->GetPerfCountersCollection()->logger_add(mlogger);
+    g_ceph_context->GetPerfCountersCollection()->add(mlogger);
   }
 
   mdlog->create_logger();

diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index dbdd96f4db77fc63146ef1055bc1e390b4bdd5fc..c724a722dd7ef0eb35e5cdda6bac712696abd842 100644 (file)
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@ -75,7 +75,7 @@ void Server::create_logger()
   plb.add_u64_counter(l_mdss_dcreq, "dcreq"); // dispatch client req
   plb.add_u64_counter(l_mdss_dsreq, "dsreq"); // slave
   logger = plb.create_perf_counters();
-  g_ceph_context->GetPerfCountersCollection()->logger_add(logger);
+  g_ceph_context->GetPerfCountersCollection()->add(logger);
 }
 
 

diff --git a/src/mds/Server.h b/src/mds/Server.h
index ba6265af2859300ccae30ba0b8577f68646757bf..6e9b7f6d2124a2324c4aeb34ad8346e79aa8fda6 100644 (file)
--- a/src/mds/Server.h
+++ b/src/mds/Server.h
@@ -57,7 +57,7 @@ public:
     terminating_sessions(false) {
   }
   ~Server() {
-    g_ceph_context->GetPerfCountersCollection()->logger_remove(logger);
+    g_ceph_context->GetPerfCountersCollection()->remove(logger);
     delete logger;
   }
 

diff --git a/src/os/FileStore.cc b/src/os/FileStore.cc
index a975d65871debd359dc50f7069da1c854fe92e67..90188f0bcacc7386a30da75d81405eaa41efd315 100644 (file)
--- a/src/os/FileStore.cc
+++ b/src/os/FileStore.cc
@@ -1793,7 +1793,7 @@ void FileStore::start_logger(int whoami, utime_t tare)
   logger = plb.create_perf_counters();
   if (journal)
     journal->logger = logger;
-  g_ceph_context->GetPerfCountersCollection()->logger_add(logger);
+  g_ceph_context->GetPerfCountersCollection()->add(logger);
 }
 
 void FileStore::stop_logger()
@@ -1802,7 +1802,7 @@ void FileStore::stop_logger()
   if (logger) {
     if (journal)
       journal->logger = NULL;
-    g_ceph_context->GetPerfCountersCollection()->logger_remove(logger);
+    g_ceph_context->GetPerfCountersCollection()->remove(logger);
     delete logger;
     logger = NULL;
   }

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index cf93aa71cb2b53fe0198dd5ce77c425b9baf1d31..59623f86120fe2009df720767a388d1080630818 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -584,7 +584,7 @@ OSD::~OSD()
   delete authorize_handler_registry;
   delete map_in_progress_cond;
   delete class_handler;
-  g_ceph_context->GetPerfCountersCollection()->logger_remove(logger);
+  g_ceph_context->GetPerfCountersCollection()->remove(logger);
   delete logger;
   delete store;
 }
@@ -804,7 +804,7 @@ void OSD::create_logger()
   osd_plb.add_u64_counter(l_osd_mape_dup, "mape_dup"); // dup osdmap epochs
 
   logger = osd_plb.create_perf_counters();
-  g_ceph_context->GetPerfCountersCollection()->logger_add(logger);
+  g_ceph_context->GetPerfCountersCollection()->add(logger);
 }
 
 int OSD::shutdown()