common/perf_counters: rename histogram adder method

Specifically, it's a u64 counter histogram.

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

diff --git a/src/common/perf_counters.cc b/src/common/perf_counters.cc
index 5b5201aeb7a5329010a4d47b4463dc665dfb2b35..2cdf7de25c207baabefca4cff0ed7b86ded1d88f 100644 (file)
--- a/src/common/perf_counters.cc
+++ b/src/common/perf_counters.cc
@@ -521,7 +521,7 @@ void PerfCountersBuilder::add_time_avg(
           PERFCOUNTER_TIME | PERFCOUNTER_LONGRUNAVG);
 }
 
-void PerfCountersBuilder::add_histogram(
+void PerfCountersBuilder::add_u64_counter_histogram(
   int idx, const char *name,
   PerfHistogramCommon::axis_config_d x_axis_config,
   PerfHistogramCommon::axis_config_d y_axis_config,

diff --git a/src/common/perf_counters.h b/src/common/perf_counters.h
index bc927792e4b1f4f486050659b6be688f081d51ed..95426af5142385b6097e20f898c79248b4b9643a 100644 (file)
--- a/src/common/perf_counters.h
+++ b/src/common/perf_counters.h
@@ -313,12 +313,14 @@ public:
                    const char *description=NULL,
                    const char *nick = NULL,
                    int prio=0);
-  void add_histogram(int key, const char* name,
-                    PerfHistogramCommon::axis_config_d x_axis_config,
-                    PerfHistogramCommon::axis_config_d y_axis_config,
-                    const char *description=NULL,
-                    const char* nick = NULL,
-                    int prio=0);
+  void add_u64_counter_histogram(
+    int key, const char* name,
+    PerfHistogramCommon::axis_config_d x_axis_config,
+    PerfHistogramCommon::axis_config_d y_axis_config,
+    const char *description=NULL,
+    const char* nick = NULL,
+    int prio=0);
+
   PerfCounters* create_perf_counters();
 private:
   PerfCountersBuilder(const PerfCountersBuilder &rhs);

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index e6d18ecd2df6702ee997928f8df63ad72a133df5..38d79eacdd365ad376d0e67ef9bd3d7737ebdb63 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -2797,7 +2797,7 @@ void OSD::create_logger()
   osd_plb.add_time_avg(
     l_osd_op_r_lat, "op_r_latency",
     "Latency of read operation (including queue time)");
-  osd_plb.add_histogram(
+  osd_plb.add_u64_counter_histogram(
     l_osd_op_r_lat_outb_hist, "op_r_latency_out_bytes_histogram",
     op_hist_x_axis_config, op_hist_y_axis_config,
     "Histogram of operation latency (including queue time) + data read");
@@ -2814,7 +2814,7 @@ void OSD::create_logger()
   osd_plb.add_time_avg(
     l_osd_op_w_lat,  "op_w_latency",
     "Latency of write operation (including queue time)");
-  osd_plb.add_histogram(
+  osd_plb.add_u64_counter_histogram(
     l_osd_op_w_lat_inb_hist, "op_w_latency_in_bytes_histogram",
     op_hist_x_axis_config, op_hist_y_axis_config,
     "Histogram of operation latency (including queue time) + data written");
@@ -2836,11 +2836,11 @@ void OSD::create_logger()
   osd_plb.add_time_avg(
     l_osd_op_rw_lat, "op_rw_latency",
     "Latency of read-modify-write operation (including queue time)");
-  osd_plb.add_histogram(
+  osd_plb.add_u64_counter_histogram(
     l_osd_op_rw_lat_inb_hist, "op_rw_latency_in_bytes_histogram",
     op_hist_x_axis_config, op_hist_y_axis_config,
     "Histogram of rw operation latency (including queue time) + data written");
-  osd_plb.add_histogram(
+  osd_plb.add_u64_counter_histogram(
     l_osd_op_rw_lat_outb_hist, "op_rw_latency_out_bytes_histogram",
     op_hist_x_axis_config, op_hist_y_axis_config,
     "Histogram of rw operation latency (including queue time) + data read");