Use vespalib::count_s

2 files changed, 9 insertions, 4 deletions

diff --git a/vespalib/src/tests/time/time_test.cpp b/vespalib/src/tests/time/time_test.cpp
index 40542b6ca62..352835ea101 100644
--- a/vespalib/src/tests/time/time_test.cpp
+++ b/vespalib/src/tests/time/time_test.cpp
@@ -40,10 +40,11 @@ TEST(TimeTest, timeval_conversion_works_as_expected) {
 }
 
 TEST(TimeTest, unit_counting_works_as_expected) {
-    auto d = 3ms + 5us + 7ns;
-    EXPECT_EQ(count_ns(d), 3005007);
-    EXPECT_EQ(count_us(d), 3005);
-    EXPECT_EQ(count_ms(d), 3);
+    auto d = 7s + 3ms + 5us + 7ns;
+    EXPECT_EQ(count_ns(d), 7003005007);
+    EXPECT_EQ(count_us(d), 7003005);
+    EXPECT_EQ(count_ms(d), 7003);
+    EXPECT_EQ(count_s(d), 7);
 }
 
 GTEST_MAIN_RUN_ALL_TESTS()
diff --git a/vespalib/src/vespa/vespalib/util/time.h b/vespalib/src/vespa/vespalib/util/time.h
index f6841c70258..187d62001ae 100644
--- a/vespalib/src/vespa/vespalib/util/time.h
+++ b/vespalib/src/vespa/vespalib/util/time.h
@@ -46,6 +46,10 @@ constexpr duration from_s(double seconds) {
     return std::chrono::duration_cast<duration>(std::chrono::duration<double>(seconds));
 }
 
+constexpr int64_t count_s(duration d) {
+    return std::chrono::duration_cast<std::chrono::seconds>(d).count();
+}
+
 constexpr int64_t count_ms(duration d) {
     return std::chrono::duration_cast<std::chrono::milliseconds>(d).count();
 }