From 94e47cf40950c18d6ac41eb987fb59b8676316f6 Mon Sep 17 00:00:00 2001 From: Ved-vampir Date: Wed, 25 Feb 2015 13:09:04 +0300 Subject: [PATCH] common: change default value for perfcounter description ("NO_INFO_FIX">NULL) Signed-off-by: Alyona Kiseleva --- src/common/perf_counters.cc | 5 ++++- src/common/perf_counters.h | 10 +++++----- src/test/perf_counters.cc | 4 ++-- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/common/perf_counters.cc b/src/common/perf_counters.cc index f520e1fb1756..ecf28f2abeeb 100644 --- a/src/common/perf_counters.cc +++ b/src/common/perf_counters.cc @@ -292,7 +292,10 @@ void PerfCounters::dump_formatted(Formatter *f, bool schema, if (schema) { f->open_object_section(d->name); f->dump_int("type", d->type); - f->dump_string("description", d->description); + if (d->description) + f->dump_string("description", d->description); + else + f->dump_string("description", ""); f->close_section(); } else { if (d->type & PERFCOUNTER_LONGRUNAVG) { diff --git a/src/common/perf_counters.h b/src/common/perf_counters.h index c11e8c2a6bdf..b38a067f9959 100644 --- a/src/common/perf_counters.h +++ b/src/common/perf_counters.h @@ -239,11 +239,11 @@ public: PerfCountersBuilder(CephContext *cct, const std::string &name, int first, int last); ~PerfCountersBuilder(); - void add_u64(int key, const char *name, const char *description = "NO_INFO_FIX"); - void add_u64_counter(int key, const char *name, const char *description = "NO_INFO_FIX"); - void add_u64_avg(int key, const char *name, const char *description = "NO_INFO_FIX"); - void add_time(int key, const char *name, const char *description = "NO_INFO_FIX"); - void add_time_avg(int key, const char *name, const char *description = "NO_INFO_FIX"); + void add_u64(int key, const char *name, const char *description = NULL); + void add_u64_counter(int key, const char *name, const char *description = NULL); + void add_u64_avg(int key, const char *name, const char *description = NULL); + void add_time(int key, const char *name, const char *description = NULL); + void add_time_avg(int key, const char *name, const char *description = NULL); PerfCounters* create_perf_counters(); private: PerfCountersBuilder(const PerfCountersBuilder &rhs); diff --git a/src/test/perf_counters.cc b/src/test/perf_counters.cc index 1a93db42f784..1468d806a163 100644 --- a/src/test/perf_counters.cc +++ b/src/test/perf_counters.cc @@ -182,8 +182,8 @@ TEST(PerfCounters, MultiplePerfCounters) { "\"element3\":{\"avgcount\":0,\"sum\":0.000000000}}}"), msg); ASSERT_EQ("", client.do_request("{ \"prefix\": \"perf schema\", \"format\": \"json\" }", &msg)); - ASSERT_EQ(sd("{\"test_perfcounter_1\":{\"element1\":{\"type\":2,\"description\":\"NO_INFO_FIX\"}," - "\"element2\":{\"type\":1,\"description\":\"NO_INFO_FIX\"},\"element3\":{\"type\":5,\"description\":\"NO_INFO_FIX\"}}}"), msg); + ASSERT_EQ(sd("{\"test_perfcounter_1\":{\"element1\":{\"type\":2,\"description\":\"\"}," + "\"element2\":{\"type\":1,\"description\":\"\"},\"element3\":{\"type\":5,\"description\":\"\"}}}"), msg); coll->clear(); ASSERT_EQ("", client.do_request("{ \"prefix\": \"perf dump\", \"format\": \"json\" }", &msg)); -- 2.47.3