From: Sage Weil <sage@redhat.com>
Date: Tue, 28 Mar 2017 02:41:39 +0000 (-0400)
Subject: common/perf_counters: require nicks be <= 4 chars
X-Git-Tag: v12.0.3~71^2~24
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5b6e7913808e3589e9692d88b82d2b0856d0e40b;p=ceph.git

common/perf_counters: require nicks be <= 4 chars

This keeps the column sizes at 5 chars for 'ceph daemonperf'.

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

diff --git a/src/common/perf_counters.cc b/src/common/perf_counters.cc
index c869880a1e24..0e8355ccde2b 100644
--- a/src/common/perf_counters.cc
+++ b/src/common/perf_counters.cc
@@ -504,6 +504,10 @@ void PerfCountersBuilder::add_impl(int idx, const char *name,
   assert(data.type == PERFCOUNTER_NONE);
   data.name = name;
   data.description = description;
+  // nick must be <= 4 chars
+  if (nick) {
+    assert(strlen(nick) <= 4);
+  }
   data.nick = nick;
   data.type = (enum perfcounter_type_d)ty;
   data.histogram = std::move(histogram);