summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSage Weil <sage.weil@dreamhost.com>2011-10-27 01:00:45 +0200
committerSage Weil <sage.weil@dreamhost.com>2011-10-27 01:00:45 +0200
commit180c744bf30aea141ceacee240d67e1247144abb (patch)
tree7d0621514cfb5cea8e9b9caa64a4b4b948a858d4
parentobjecter: instrument with perfcounter (diff)
downloadceph-180c744bf30aea141ceacee240d67e1247144abb.tar.xz
ceph-180c744bf30aea141ceacee240d67e1247144abb.zip
perfcounters: fix accessor name
FreakingCamelCaps Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
-rw-r--r--src/common/admin_socket.cc2
-rw-r--r--src/common/ceph_context.cc2
-rw-r--r--src/common/ceph_context.h2
-rw-r--r--src/mds/MDLog.cc4
-rw-r--r--src/mds/MDS.cc8
-rw-r--r--src/mds/Server.cc2
-rw-r--r--src/mds/Server.h2
-rw-r--r--src/os/FileStore.cc4
-rw-r--r--src/osd/OSD.cc4
-rw-r--r--src/osdc/Objecter.cc4
-rw-r--r--src/test/perf_counters.cc4
11 files changed, 19 insertions, 19 deletions
diff --git a/src/common/admin_socket.cc b/src/common/admin_socket.cc
index 9ca231454f7..650317a64f0 100644
--- a/src/common/admin_socket.cc
+++ b/src/common/admin_socket.cc
@@ -298,7 +298,7 @@ private:
std::vector<char> buffer;
buffer.reserve(512);
- PerfCountersCollection *coll = m_parent->m_cct->GetPerfCountersCollection();
+ PerfCountersCollection *coll = m_parent->m_cct->get_perfcounters_collection();
if (coll) {
coll->write_json_to_buf(buffer, schema);
}
diff --git a/src/common/ceph_context.cc b/src/common/ceph_context.cc
index c15ef1c8d78..4634339c33b 100644
--- a/src/common/ceph_context.cc
+++ b/src/common/ceph_context.cc
@@ -189,7 +189,7 @@ uint32_t CephContext::get_module_type() const
return _module_type;
}
-PerfCountersCollection *CephContext::GetPerfCountersCollection()
+PerfCountersCollection *CephContext::get_perfcounters_collection()
{
return _perf_counters_collection;
}
diff --git a/src/common/ceph_context.h b/src/common/ceph_context.h
index e78ab05bb04..583d5418a44 100644
--- a/src/common/ceph_context.h
+++ b/src/common/ceph_context.h
@@ -64,7 +64,7 @@ public:
uint32_t get_module_type() const;
/* Get the PerfCountersCollection of this CephContext */
- PerfCountersCollection *GetPerfCountersCollection();
+ PerfCountersCollection *get_perfcounters_collection();
ceph::HeartbeatMap *get_heartbeat_map() {
return _heartbeat_map;
diff --git a/src/mds/MDLog.cc b/src/mds/MDLog.cc
index 1ec92f9f82a..40784d1df1e 100644
--- 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()->remove(logger);
+ g_ceph_context->get_perfcounters_collection()->remove(logger);
delete logger;
logger = 0;
}
@@ -70,7 +70,7 @@ void MDLog::create_logger()
// logger
logger = plb.create_perf_counters();
- g_ceph_context->GetPerfCountersCollection()->add(logger);
+ g_ceph_context->get_perfcounters_collection()->add(logger);
}
void MDLog::init_journaler()
diff --git a/src/mds/MDS.cc b/src/mds/MDS.cc
index 2a7f5e2e01f..7d0b8bc66ba 100644
--- 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()->remove(logger);
+ g_ceph_context->get_perfcounters_collection()->remove(logger);
delete logger;
logger = 0;
}
if (mlogger) {
- g_ceph_context->GetPerfCountersCollection()->remove(logger);
+ g_ceph_context->get_perfcounters_collection()->remove(logger);
delete mlogger;
mlogger = 0;
}
@@ -252,7 +252,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()->add(logger);
+ g_ceph_context->get_perfcounters_collection()->add(logger);
}
{
@@ -274,7 +274,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()->add(mlogger);
+ g_ceph_context->get_perfcounters_collection()->add(mlogger);
}
mdlog->create_logger();
diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index c445706776d..41e0910646e 100644
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@ -73,7 +73,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()->add(logger);
+ g_ceph_context->get_perfcounters_collection()->add(logger);
}
diff --git a/src/mds/Server.h b/src/mds/Server.h
index 6e9b7f6d212..ad8dced8691 100644
--- a/src/mds/Server.h
+++ b/src/mds/Server.h
@@ -57,7 +57,7 @@ public:
terminating_sessions(false) {
}
~Server() {
- g_ceph_context->GetPerfCountersCollection()->remove(logger);
+ g_ceph_context->get_perfcounters_collection()->remove(logger);
delete logger;
}
diff --git a/src/os/FileStore.cc b/src/os/FileStore.cc
index 1fdc05c60ea..f9215e8fa81 100644
--- a/src/os/FileStore.cc
+++ b/src/os/FileStore.cc
@@ -1710,7 +1710,7 @@ int FileStore::mount()
timer.init();
- g_ceph_context->GetPerfCountersCollection()->add(logger);
+ g_ceph_context->get_perfcounters_collection()->add(logger);
// all okay.
return 0;
@@ -1746,7 +1746,7 @@ int FileStore::umount()
journal_stop();
- g_ceph_context->GetPerfCountersCollection()->remove(logger);
+ g_ceph_context->get_perfcounters_collection()->remove(logger);
op_finisher.stop();
ondisk_finisher.stop();
diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 959bb4fa3eb..f44fdfbe42c 100644
--- 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()->remove(logger);
+ g_ceph_context->get_perfcounters_collection()->remove(logger);
delete logger;
delete store;
}
@@ -802,7 +802,7 @@ void OSD::create_logger()
osd_plb.add_u64_counter(l_osd_mape_dup, "map_message_epoch_dups"); // dup osdmap epochs
logger = osd_plb.create_perf_counters();
- g_ceph_context->GetPerfCountersCollection()->add(logger);
+ g_ceph_context->get_perfcounters_collection()->add(logger);
}
int OSD::shutdown()
diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc
index 9d0ac0b6b8d..6d93b5cdf46 100644
--- a/src/osdc/Objecter.cc
+++ b/src/osdc/Objecter.cc
@@ -196,7 +196,7 @@ void Objecter::init()
pcb.add_u64(l_osdc_osd_laggy, "osd_laggy");
logger = pcb.create_perf_counters();
- cct->GetPerfCountersCollection()->add(logger);
+ cct->get_perfcounters_collection()->add(logger);
}
timer.add_event_after(cct->_conf->objecter_tick_interval, new C_Tick(this));
@@ -212,7 +212,7 @@ void Objecter::shutdown()
}
if (logger) {
- cct->GetPerfCountersCollection()->remove(logger);
+ cct->get_perfcounters_collection()->remove(logger);
delete logger;
logger = NULL;
}
diff --git a/src/test/perf_counters.cc b/src/test/perf_counters.cc
index fa4f178d839..9d8b13dcf7d 100644
--- a/src/test/perf_counters.cc
+++ b/src/test/perf_counters.cc
@@ -75,7 +75,7 @@ static PerfCounters* setup_test_perfcounters1(CephContext *cct)
}
TEST(PerfCounters, SinglePerfCounters) {
- PerfCountersCollection *coll = g_ceph_context->GetPerfCountersCollection();
+ PerfCountersCollection *coll = g_ceph_context->get_perfcounters_collection();
PerfCounters* fake_pf = setup_test_perfcounters1(g_ceph_context);
coll->add(fake_pf);
g_ceph_context->_conf->set_val_or_die("admin_socket", get_rand_socket_path());
@@ -115,7 +115,7 @@ static PerfCounters* setup_test_perfcounter2(CephContext *cct)
}
TEST(PerfCounters, MultiplePerfCounters) {
- PerfCountersCollection *coll = g_ceph_context->GetPerfCountersCollection();
+ PerfCountersCollection *coll = g_ceph_context->get_perfcounters_collection();
coll->clear();
PerfCounters* fake_pf1 = setup_test_perfcounters1(g_ceph_context);
PerfCounters* fake_pf2 = setup_test_perfcounter2(g_ceph_context);