From: Ronen Friedman <rfriedma@redhat.com>
Date: Tue, 5 Oct 2021 12:27:44 +0000 (+0000)
Subject: common/ceph_time: fix wrong seconds output in exact_timespan_str()
X-Git-Tag: v17.1.0~690^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=f929556bdd756c9258e6283a29d85b82395296cc;p=ceph-ci.git

common/ceph_time: fix wrong seconds output in exact_timespan_str()

For example: 170.567s fixed from "2m500.567s" to "2m50.567s"

Fixes: https://tracker.ceph.com/issues/52815

Signed-off-by: Ronen Friedman <rfriedma@redhat.com>
---

diff --git a/src/common/ceph_time.cc b/src/common/ceph_time.cc
index 1b8c3ae08a5..4af48a8a2a2 100644
--- a/src/common/ceph_time.cc
+++ b/src/common/ceph_time.cc
@@ -149,11 +149,11 @@ std::string timespan_str(timespan t)
   // that isn't as lame as this one!
   uint64_t nsec = std::chrono::nanoseconds(t).count();
   std::ostringstream ss;
-  if (nsec < 2000000000) {
-    ss << ((float)nsec / 1000000000) << "s";
+  if (nsec < 2'000'000'000) {
+    ss << ((float)nsec / 1'000'000'000) << "s";
     return ss.str();
   }
-  uint64_t sec = nsec / 1000000000;
+  uint64_t sec = nsec / 1'000'000'000;
   if (sec < 120) {
     ss << sec << "s";
     return ss.str();
@@ -191,8 +191,8 @@ std::string timespan_str(timespan t)
 std::string exact_timespan_str(timespan t)
 {
   uint64_t nsec = std::chrono::nanoseconds(t).count();
-  uint64_t sec = nsec / 1000000000;
-  nsec %= 1000000000;
+  uint64_t sec = nsec / 1'000'000'000;
+  nsec %= 1'000'000'000;
   uint64_t yr = sec / (60 * 60 * 24 * 365);
   std::ostringstream ss;
   if (yr) {
@@ -224,14 +224,12 @@ std::string exact_timespan_str(timespan t)
     ss << min << "m";
     sec -= min * 60;
   }
-  if (sec) {
-    ss << sec;
-  }
-  if (nsec) {
-    ss << ((float)nsec / 1000000000);
-  }
   if (sec || nsec) {
-    ss << "s";
+    if (nsec) {
+      ss << (((float)nsec / 1'000'000'000) + sec) << "s";
+    } else {
+      ss << sec << "s";
+    }
   }
   return ss.str();
 }