rrdtool plugin: Fix the "random variation" implementation.

[collectd.git] / src / utils_time.h

diff --git a/src/utils_time.h b/src/utils_time.h
index fecf544..c3928d6 100644 (file)
--- a/src/utils_time.h
+++ b/src/utils_time.h
@@ -41,11 +41,24 @@ typedef uint64_t cdtime_t;
 #define CDTIME_T_TO_DOUBLE(t) (((double) (t)) / 1073741824.0)
 #define DOUBLE_TO_CDTIME_T(d) ((cdtime_t) ((d) * 1073741824.0))
 
-#define US_TO_CDTIME_T(us) ((cdtime_t) (((double) (us)) * 1073.741824))
-#define NS_TO_CDTIME_T(ns) ((cdtime_t) (((double) (ns)) * 1.073741824))
+#define CDTIME_T_TO_MS(t)  ((long)        (((double) (t))  / 1073741.824))
 
+#define US_TO_CDTIME_T(us) ((cdtime_t)    (((double) (us)) * 1073.741824))
+#define CDTIME_T_TO_US(t)  ((suseconds_t) (((double) (t))  / 1073.741824))
+#define NS_TO_CDTIME_T(ns) ((cdtime_t)    (((double) (ns)) * 1.073741824))
+#define CDTIME_T_TO_NS(t)  ((long)        (((double) (t))  / 1.073741824))
+
+#define CDTIME_T_TO_TIMEVAL(cdt,tvp) do {                                    \
+       (tvp)->tv_sec = CDTIME_T_TO_TIME_T (cdt);                            \
+       (tvp)->tv_used = CDTIME_T_TO_US ((cdt) % 1073741824)                 \
+} while (0)
 #define TIMEVAL_TO_CDTIME_T(tv) (TIME_T_TO_CDTIME_T ((tv).tv_sec) \
                + US_TO_CDTIME_T ((tv).tv_usec))
+
+#define CDTIME_T_TO_TIMESPEC(cdt,tsp) do {                                   \
+       (tsp)->tv_sec = CDTIME_T_TO_TIME_T (cdt);                            \
+       (tsp)->tv_nsec = CDTIME_T_TO_NS ((cdt) % 1073741824);                \
+} while (0)
 #define TIMESPEC_TO_CDTIME_T(ts) (TIME_T_TO_CDTIME_T ((ts).tv_sec) \
                + NS_TO_CDTIME_T ((ts).tv_nsec))