From: Sage Weil <sage@inktank.com>
Date: Sat, 27 Jul 2013 04:42:25 +0000 (-0700)
Subject: common/perf_counters: fix missing decimal in time, quoting
X-Git-Tag: v0.67-rc3~26
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2aa9afa5c542914a5ab679070ef6500e74a42770;p=ceph.git

common/perf_counters: fix missing decimal in time, quoting

We shouldn't quote integer or float values.  Also easier to use
dump_unsigned.

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

diff --git a/src/common/perf_counters.cc b/src/common/perf_counters.cc
index 86fb531f737c..1dd4cdabd9d8 100644
--- a/src/common/perf_counters.cc
+++ b/src/common/perf_counters.cc
@@ -223,24 +223,24 @@ void PerfCounters::dump_formatted(Formatter *f, bool schema)
       if (d->type & PERFCOUNTER_LONGRUNAVG) {
 	f->open_object_section(d->name);
 	if (d->type & PERFCOUNTER_U64) {
-	  f->dump_format("avgcount", "%"PRId64, d->avgcount);
-	  f->dump_format("sum", "%"PRId64, d->u64);
+	  f->dump_unsigned("avgcount", d->avgcount);
+	  f->dump_unsigned("sum", d->u64);
 	} else if (d->type & PERFCOUNTER_TIME) {
-	  f->dump_format("avgcount", "%"PRId64, d->avgcount);
-	  f->dump_format("sum", "%"PRId64"%09"PRId64,
-			 d->u64 / 1000000000ull,
-			 d->u64 % 1000000000ull);
+	  f->dump_unsigned("avgcount", d->avgcount);
+	  f->dump_format_unquoted("sum", "%"PRId64".%09"PRId64,
+				  d->u64 / 1000000000ull,
+				  d->u64 % 1000000000ull);
 	} else {
 	  assert(0);
 	}
 	f->close_section();
       } else {
 	if (d->type & PERFCOUNTER_U64) {
-	  f->dump_format(d->name, "%"PRId64, d->u64);
+	  f->dump_unsigned(d->name, d->u64);
 	} else if (d->type & PERFCOUNTER_TIME) {
-	  f->dump_format(d->name, "%"PRId64"%09"PRId64,
-			 d->u64 / 1000000000ull,
-			 d->u64 % 1000000000ull);
+	  f->dump_format_unquoted(d->name, "%"PRId64".%09"PRId64,
+				  d->u64 / 1000000000ull,
+				  d->u64 % 1000000000ull);
 	} else {
 	  assert(0);
 	}