commit 648b3613e7ad9e6d77a55ef5cba27fa7ef87b92b
author Austin Schuh <austin.linux@gmail.com> Mon Nov 20 01:02:24 2017 -0800
committer Austin Schuh <austin.linux@gmail.com> Mon Nov 20 01:03:46 2017 -0800
tree b1c6f2b3d5769208fb229b171890c2e055b086b9
parent da3b88249f25ed0dd3b4dbffc704dc49e5996704

Remove rounding on printing time.

1.999999999 was rendering as 1.1000000 seconds instead of 2.000000 or
1.999999 seconds.  Wrapping the big digit is not worth it at this
level, so let's drop that feature.

Change-Id: I46a9b75049332d530e7c3c5ccc4cca30430d9572

aos/common/logging/implementations_test.cc

diff --git a/aos/common/logging/implementations_test.cc b/aos/common/logging/implementations_test.cc
index aade0d1..9663fd2 100644
--- a/aos/common/logging/implementations_test.cc
+++ b/aos/common/logging/implementations_test.cc
@@ -211,10 +211,10 @@
   // Make sure rounding works correctly.
   ASSERT_EQ(18, snprintf(buffer, sizeof(buffer), AOS_TIME_FORMAT,
                          AOS_TIME_ARGS(2, 999)));
-  EXPECT_EQ("0000000002.000001s", ::std::string(buffer));
+  EXPECT_EQ("0000000002.000000s", ::std::string(buffer));
   ASSERT_EQ(18, snprintf(buffer, sizeof(buffer), AOS_TIME_FORMAT,
                          AOS_TIME_ARGS(2, 500)));
-  EXPECT_EQ("0000000002.000001s", ::std::string(buffer));
+  EXPECT_EQ("0000000002.000000s", ::std::string(buffer));
   ASSERT_EQ(18, snprintf(buffer, sizeof(buffer), AOS_TIME_FORMAT,
                          AOS_TIME_ARGS(2, 499)));
   EXPECT_EQ("0000000002.000000s", ::std::string(buffer));
@@ -223,6 +223,11 @@
   ASSERT_EQ(18, snprintf(buffer, sizeof(buffer), AOS_TIME_FORMAT,
                          AOS_TIME_ARGS(1, 995000000)));
   EXPECT_EQ("0000000001.995000s", ::std::string(buffer));
+
+  // This used to result in "0000000001.099500s".
+  ASSERT_EQ(18, snprintf(buffer, sizeof(buffer), AOS_TIME_FORMAT,
+                         AOS_TIME_ARGS(1, 999999999)));
+  EXPECT_EQ("0000000001.999999s", ::std::string(buffer));
 }
 
 TEST(LoggingPrintFormatTest, Base) {

aos/common/logging/printf_formats.h

diff --git a/aos/common/logging/printf_formats.h b/aos/common/logging/printf_formats.h
index b098865..60960a4 100644
--- a/aos/common/logging/printf_formats.h
+++ b/aos/common/logging/printf_formats.h
@@ -11,9 +11,7 @@
 
 #define AOS_TIME_FORMAT \
   "%010" PRId32 ".%0" STRINGIFY(AOS_TIME_NSECONDS_DIGITS) PRId32 "s"
-#define AOS_TIME_ARGS(sec, nsec)                      \
-  sec, (nsec + (AOS_TIME_NSECONDS_DENOMINATOR / 2)) / \
-      AOS_TIME_NSECONDS_DENOMINATOR
+#define AOS_TIME_ARGS(sec, nsec) sec, (nsec / AOS_TIME_NSECONDS_DENOMINATOR)
 
 #define AOS_LOGGING_BASE_FORMAT \
   "%.*s(%" PRId32 ")(%05" PRIu16 "): %-7s at " AOS_TIME_FORMAT ": "