time: make trivial functions inline
[ccan] / ccan / time / time.c
index 5e36bf7b48dec210ac3f9341b9caee53b7164acb..166832d8a961d56b8ebcf9ebd4b58c62d1b1e4ed 100644 (file)
 /* Licensed under BSD-MIT - see LICENSE file for details */
 #include <ccan/time/time.h>
 #include <stdlib.h>
-#include <assert.h>
+#include <stdio.h>
 
-struct timeval time_now(void)
+#if !HAVE_CLOCK_GETTIME && !HAVE_CLOCK_GETTIME_IN_LIBRT
+#include <sys/time.h>
+
+struct timespec time_now(void)
 {
        struct timeval now;
+       struct timespec ret;
        gettimeofday(&now, NULL);
-       return now;
+       ret.tv_sec = now.tv_sec;
+       ret.tv_nsec = now.tv_usec * 1000;
+       return TIME_CHECK(ret);
 }
-
-bool time_greater(struct timeval a, struct timeval b)
+#else
+#include <time.h>
+struct timespec time_now(void)
 {
-       if (a.tv_sec > b.tv_sec)
-               return true;
-       else if (a.tv_sec < b.tv_sec)
-                return false;
-
-       return a.tv_usec > b.tv_usec;
+       struct timespec ret;
+       clock_gettime(CLOCK_REALTIME, &ret);
+       return TIME_CHECK(ret);
 }
+#endif /* HAVE_CLOCK_GETTIME || HAVE_CLOCK_GETTIME_IN_LIBRT */
 
-bool time_less(struct timeval a, struct timeval b)
+struct timespec time_divide(struct timespec t, unsigned long div)
 {
-       if (a.tv_sec < b.tv_sec)
-               return true;
-       else if (a.tv_sec > b.tv_sec)
-                return false;
-
-       return a.tv_usec < b.tv_usec;
-}
-
-bool time_eq(struct timeval a, struct timeval b)
-{
-       return a.tv_sec == b.tv_sec && a.tv_usec == b.tv_usec;
-}
-
-struct timeval time_sub(struct timeval recent, struct timeval old)
-{
-       struct timeval diff;
-
-       diff.tv_sec = recent.tv_sec - old.tv_sec;
-       if (old.tv_usec > recent.tv_usec) {
-               diff.tv_sec--;
-               diff.tv_usec = 1000000 + recent.tv_usec - old.tv_usec;
-       } else
-               diff.tv_usec = recent.tv_usec - old.tv_usec;
-
-       assert(diff.tv_sec >= 0);
-       return diff;
-}
-
-struct timeval time_add(struct timeval a, struct timeval b)
-{
-       struct timeval sum;
-
-       sum.tv_sec = a.tv_sec + b.tv_sec;
-       sum.tv_usec = a.tv_usec + b.tv_usec;
-       if (sum.tv_usec > 1000000) {
-               sum.tv_sec++;
-               sum.tv_usec -= 1000000;
+       struct timespec res;
+       uint64_t rem, ns;
+
+       /* Dividing seconds is simple. */
+       res.tv_sec = TIME_CHECK(t).tv_sec / div;
+       rem = t.tv_sec % div;
+
+       /* If we can't fit remainder * 1,000,000,000 in 64 bits? */
+#if 0 /* ilog is great, but we use fp for multiply anyway. */
+       bits = ilog64(rem);
+       if (bits + 30 >= 64) {
+               /* Reduce accuracy slightly */
+               rem >>= (bits - (64 - 30));
+               div >>= (bits - (64 - 30));
        }
-       return sum;
-}
-
-struct timeval time_divide(struct timeval t, unsigned long div)
-{
-       return time_from_usec(time_to_usec(t) / div);
-}
-
-struct timeval time_multiply(struct timeval t, unsigned long mult)
-{
-       return time_from_usec(time_to_usec(t) * mult);
-}
-
-uint64_t time_to_msec(struct timeval t)
-{
-       uint64_t msec;
-
-       msec = t.tv_usec / 1000 + (uint64_t)t.tv_sec * 1000;
-       return msec;
+#endif
+       if (rem & ~(((uint64_t)1 << 30) - 1)) {
+               /* FIXME: fp is cheating! */
+               double nsec = rem * 1000000000.0 + t.tv_nsec;
+               res.tv_nsec = nsec / div;
+       } else {
+               ns = rem * 1000000000 + t.tv_nsec;
+               res.tv_nsec = ns / div;
+       }
+       return TIME_CHECK(res);
 }
 
-uint64_t time_to_usec(struct timeval t)
+struct timespec time_multiply(struct timespec t, unsigned long mult)
 {
-       uint64_t usec;
+       struct timespec res;
 
-       usec = t.tv_usec + (uint64_t)t.tv_sec * 1000000;
-       return usec;
-}
+       /* Are we going to overflow if we multiply nsec? */
+       if (mult & ~((1UL << 30) - 1)) {
+               /* FIXME: fp is cheating! */
+               double nsec = (double)t.tv_nsec * mult;
 
-struct timeval time_from_msec(uint64_t msec)
-{
-       struct timeval t;
+               res.tv_sec = nsec / 1000000000.0;
+               res.tv_nsec = nsec - (res.tv_sec * 1000000000.0);
+       } else {
+               uint64_t nsec = t.tv_nsec * mult;
 
-       t.tv_usec = (msec % 1000) * 1000;
-       t.tv_sec = msec / 1000;
-       return t;
+               res.tv_nsec = nsec % 1000000000;
+               res.tv_sec = nsec / 1000000000;
+       }
+       res.tv_sec += TIME_CHECK(t).tv_sec * mult;
+       return TIME_CHECK(res);
 }
 
-struct timeval time_from_usec(uint64_t usec)
+struct timespec time_check(struct timespec t, const char *abortstr)
 {
-       struct timeval t;
-
-       t.tv_usec = usec % 1000000;
-       t.tv_sec = usec / 1000000;
+       if (t.tv_sec < 0 || t.tv_nsec >= 1000000000) {
+               if (abortstr) {
+                       fprintf(stderr, "%s: malformed time %li.%09li\n",
+                               abortstr,
+                               (long)t.tv_sec, (long)t.tv_nsec);
+                       abort();
+               } else {
+                       struct timespec old = t;
+
+                       if (t.tv_nsec >= 1000000000) {
+                               t.tv_sec += t.tv_nsec / 1000000000;
+                               t.tv_nsec %= 1000000000;
+                       }
+                       if (t.tv_sec < 0)
+                               t.tv_sec = 0;
+
+                       fprintf(stderr, "WARNING: malformed time"
+                               " %li seconds %li ns converted to %li.%09li.\n",
+                               (long)old.tv_sec, (long)old.tv_nsec,
+                               (long)t.tv_sec, (long)t.tv_nsec);
+               }
+       }
        return t;
 }