X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fdaemon%2Futils_time_test.c;h=4d64991b94a4652e59b22c999a6ca96a366fc258;hb=f14bb45d570e0b34bdd3a2a0cadfe414c3dfda40;hp=1f13556990df096ee051c9b68dc914d5d8852ffa;hpb=db1391aaa66b8b8fad82219494f61f3452441f62;p=collectd.git diff --git a/src/daemon/utils_time_test.c b/src/daemon/utils_time_test.c index 1f135569..4d64991b 100644 --- a/src/daemon/utils_time_test.c +++ b/src/daemon/utils_time_test.c @@ -26,8 +26,8 @@ #define DBL_PRECISION 1e-3 -#include "testing.h" #include "collectd.h" +#include "testing.h" #include "utils_time.h" DEF_TEST(conversion) @@ -36,54 +36,58 @@ DEF_TEST(conversion) cdtime_t t; double d; time_t tt; + uint64_t ms; struct timeval tv; struct timespec ts; } cases[] = { - /* cdtime double time_t timeval timespec */ - { 0, 0.0 , 0, { 0, 0}, { 0, 0}}, - { 10737418240, 10.0 , 10, { 10, 0}, { 10, 0}}, - {1542908534771941376, 1436945549.0 , 1436945549, {1436945549, 0}, {1436945549, 0}}, - {1542908535540740522, 1436945549.716, 1436945550, {1436945549, 716000}, {1436945549, 716000000}}, + /* cdtime double time_t milliseconds timeval timespec */ + { 0, 0.0 , 0, 0, { 0, 0}, { 0, 0}}, + { 10737418240ULL, 10.0 , 10, 10000, { 10, 0}, { 10, 0}}, + {1542908534771941376ULL, 1436945549.0 , 1436945549, 1436945549000ULL, {1436945549, 0}, {1436945549, 0}}, + {1542908535540740522ULL, 1436945549.716, 1436945550, 1436945549716ULL, {1436945549, 716000}, {1436945549, 716000000}}, // 1426076671.123 * 2^30 = 1531238166015458148.352 - {1531238166015458148, 1426076671.123, 1426076671, {1426076671, 123000}, {1426076671, 123000000}}, + {1531238166015458148ULL, 1426076671.123, 1426076671, 1426076671123ULL, {1426076671, 123000}, {1426076671, 123000000}}, // 1426076681.234 * 2^30 = 1531238176872061730.816 - {1531238176872061731, 1426076681.234, 1426076681, {1426076681, 234000}, {1426076681, 234000000}}, + {1531238176872061731ULL, 1426076681.234, 1426076681, 1426076681234ULL, {1426076681, 234000}, {1426076681, 234000000}}, // 1426083986.314 * 2^30 = 1531246020641985396.736 - {1531246020641985397, 1426083986.314, 1426083986, {1426083986, 314000}, {1426083986, 314000000}}, + {1531246020641985397ULL, 1426083986.314, 1426083986, 1426083986314ULL, {1426083986, 314000}, {1426083986, 314000000}}, // 1426083986.494142531 * 2^30 = 1531246020835411966.5 - {1531246020835411967, 1426083986.494, 1426083986, {1426083986, 494143}, {1426083986, 494142531}}, + {1531246020835411967ULL, 1426083986.494, 1426083986, 1426083986494ULL, {1426083986, 494143}, {1426083986, 494142531}}, // 1426083986.987410814 * 2^30 = 1531246021365054752.4 - {1531246021365054752, 1426083986.987, 1426083987, {1426083986, 987411}, {1426083986, 987410814}}, + {1531246021365054752ULL, 1426083986.987, 1426083987, 1426083986987ULL, {1426083986, 987411}, {1426083986, 987410814}}, /* These cases test the cdtime_t -> ns conversion rounds correctly. */ // 1546167635576736987 / 2^30 = 1439980823.1524536265... - {1546167635576736987, 1439980823.152, 1439980823, {1439980823, 152454}, {1439980823, 152453627}}, + {1546167635576736987ULL, 1439980823.152, 1439980823, 1439980823152ULL, {1439980823, 152454}, {1439980823, 152453627}}, // 1546167831554815222 / 2^30 = 1439981005.6712620165... - {1546167831554815222, 1439981005.671, 1439981006, {1439981005, 671262}, {1439981005, 671262017}}, + {1546167831554815222ULL, 1439981005.671, 1439981006, 1439981005671ULL, {1439981005, 671262}, {1439981005, 671262017}}, // 1546167986577716567 / 2^30 = 1439981150.0475896215... - {1546167986577716567, 1439981150.048, 1439981150, {1439981150, 47590}, {1439981005, 47589622}}, + {1546167986577716567ULL, 1439981150.048, 1439981150, 1439981150048ULL, {1439981150, 47590}, {1439981150, 47589622}}, }; size_t i; for (i = 0; i < (sizeof (cases) / sizeof (cases[0])); i++) { struct timeval tv; struct timespec ts; - time_t tt; - // cdtime -> ns - CDTIME_T_TO_TIMESPEC (cases[i].t, &ts); - EXPECT_EQ_UINT64 ((uint64_t) cases[i].ts.tv_nsec, (uint64_t) ts.tv_nsec); + // cdtime -> s + EXPECT_EQ_UINT64 (cases[i].tt, CDTIME_T_TO_TIME_T (cases[i].t)); + + // cdtime -> ms + EXPECT_EQ_UINT64(cases[i].ms, CDTIME_T_TO_MS (cases[i].t)); // cdtime -> us CDTIME_T_TO_TIMEVAL (cases[i].t, &tv); - EXPECT_EQ_UINT64 ((uint64_t) cases[i].tv.tv_usec, (uint64_t) tv.tv_usec); + EXPECT_EQ_UINT64 (cases[i].tv.tv_sec, tv.tv_sec); + EXPECT_EQ_UINT64 (cases[i].tv.tv_usec, tv.tv_usec); - // cdtime -> s - tt = CDTIME_T_TO_TIME_T (cases[i].t); - EXPECT_EQ_UINT64 ((uint64_t) cases[i].tt, (uint64_t) tt); + // cdtime -> ns + CDTIME_T_TO_TIMESPEC (cases[i].t, &ts); + EXPECT_EQ_UINT64 (cases[i].ts.tv_sec, ts.tv_sec); + EXPECT_EQ_UINT64 (cases[i].ts.tv_nsec, ts.tv_nsec); // cdtime -> double - DBLEQ (cases[i].d, CDTIME_T_TO_DOUBLE (cases[i].t)); + EXPECT_EQ_DOUBLE (cases[i].d, CDTIME_T_TO_DOUBLE (cases[i].t)); } return 0; @@ -93,21 +97,20 @@ DEF_TEST(conversion) DEF_TEST(ns_to_cdtime) { struct { - long ns; + uint64_t ns; cdtime_t want; } cases[] = { // 1439981652801860766 * 2^30 / 10^9 = 1546168526406004689.4 - {1439981652801860766, 1546168526406004689}, + {1439981652801860766ULL, 1546168526406004689ULL}, // 1439981836985281914 * 2^30 / 10^9 = 1546168724171447263.4 - {1439981836985281914, 1546168724171447263}, + {1439981836985281914ULL, 1546168724171447263ULL}, // 1439981880053705608 * 2^30 / 10^9 = 1546168770415815077.4 - {1439981880053705608, 1546168770415815077}, + {1439981880053705608ULL, 1546168770415815077ULL}, }; size_t i; for (i = 0; i < (sizeof (cases) / sizeof (cases[0])); i++) { - cdtime_t got = NS_TO_CDTIME_T (cases[i].ns); - EXPECT_EQ_UINT64 ((uint64_t) cases[i].want, (uint64_t) got); + EXPECT_EQ_UINT64 (cases[i].want, NS_TO_CDTIME_T (cases[i].ns)); } return 0;