X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftime%2Ftime.c;h=54cb3f4b73ae601cf469592237bc165748593e4c;hp=65a257b3fe0a28d6ceb01ffa323262237fd21467;hb=c92b496623f29cfb3ac1ade8e52ffbfa95ab5bcf;hpb=2012d45e273c3016dbd09b2606efc9ffab07c57f;ds=sidebyside diff --git a/ccan/time/time.c b/ccan/time/time.c index 65a257b3..54cb3f4b 100644 --- a/ccan/time/time.c +++ b/ccan/time/time.c @@ -1,91 +1,38 @@ /* Licensed under BSD-MIT - see LICENSE file for details */ #include #include -#include +#include #if !HAVE_CLOCK_GETTIME && !HAVE_CLOCK_GETTIME_IN_LIBRT #include -struct timespec time_now(void) +struct timeabs time_now(void) { struct timeval now; - struct timespec ret; + struct timeabs ret; gettimeofday(&now, NULL); - ret.tv_sec = now.tv_sec; - ret.tv_nsec = now.tv_usec * 1000; - return ret; + ret.ts.tv_sec = now.tv_sec; + ret.ts.tv_nsec = now.tv_usec * 1000; + return TIMEABS_CHECK(ret); } #else #include -struct timespec time_now(void) +struct timeabs time_now(void) { - struct timespec ret; - clock_gettime(CLOCK_REALTIME, &ret); - return ret; + struct timeabs ret; + clock_gettime(CLOCK_REALTIME, &ret.ts); + return TIMEABS_CHECK(ret); } #endif /* HAVE_CLOCK_GETTIME || HAVE_CLOCK_GETTIME_IN_LIBRT */ -bool time_greater(struct timespec a, struct timespec b) -{ - if (a.tv_sec > b.tv_sec) - return true; - else if (a.tv_sec < b.tv_sec) - return false; - - return a.tv_nsec > b.tv_nsec; -} - -bool time_less(struct timespec a, struct timespec b) +struct timerel time_divide(struct timerel 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_nsec < b.tv_nsec; -} - -bool time_eq(struct timespec a, struct timespec b) -{ - return a.tv_sec == b.tv_sec && a.tv_nsec == b.tv_nsec; -} - -struct timespec time_sub(struct timespec recent, struct timespec old) -{ - struct timespec diff; - - diff.tv_sec = recent.tv_sec - old.tv_sec; - if (old.tv_nsec > recent.tv_nsec) { - diff.tv_sec--; - diff.tv_nsec = 1000000000 + recent.tv_nsec - old.tv_nsec; - } else - diff.tv_nsec = recent.tv_nsec - old.tv_nsec; - - assert(diff.tv_sec >= 0); - return diff; -} - -struct timespec time_add(struct timespec a, struct timespec b) -{ - struct timespec sum; - - sum.tv_sec = a.tv_sec + b.tv_sec; - sum.tv_nsec = a.tv_nsec + b.tv_nsec; - if (sum.tv_nsec >= 1000000000) { - sum.tv_sec++; - sum.tv_nsec -= 1000000000; - } - return sum; -} - -struct timespec time_divide(struct timespec t, unsigned long div) -{ - struct timespec res; + struct timerel res; uint64_t rem, ns; /* Dividing seconds is simple. */ - res.tv_sec = t.tv_sec / div; - rem = t.tv_sec % div; + res.ts.tv_sec = TIMEREL_CHECK(t).ts.tv_sec / div; + rem = t.ts.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. */ @@ -98,83 +45,75 @@ struct timespec time_divide(struct timespec t, unsigned long div) #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; + double nsec = rem * 1000000000.0 + t.ts.tv_nsec; + res.ts.tv_nsec = nsec / div; } else { - ns = rem * 1000000000 + t.tv_nsec; - res.tv_nsec = ns / div; + ns = rem * 1000000000 + t.ts.tv_nsec; + res.ts.tv_nsec = ns / div; } - return res; + return TIMEREL_CHECK(res); } -struct timespec time_multiply(struct timespec t, unsigned long mult) +struct timerel time_multiply(struct timerel t, unsigned long mult) { - struct timespec res; + struct timerel res; /* 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; + double nsec = (double)t.ts.tv_nsec * mult; - res.tv_sec = nsec / 1000000000.0; - res.tv_nsec = nsec - (res.tv_sec * 1000000000.0); + res.ts.tv_sec = nsec / 1000000000.0; + res.ts.tv_nsec = nsec - (res.ts.tv_sec * 1000000000.0); } else { - uint64_t nsec = t.tv_nsec * mult; + uint64_t nsec = t.ts.tv_nsec * mult; - res.tv_nsec = nsec % 1000000000; - res.tv_sec = nsec / 1000000000; + res.ts.tv_nsec = nsec % 1000000000; + res.ts.tv_sec = nsec / 1000000000; } - res.tv_sec += t.tv_sec * mult; - return res; -} - -uint64_t time_to_msec(struct timespec t) -{ - uint64_t msec; - - msec = t.tv_nsec / 1000000 + (uint64_t)t.tv_sec * 1000; - return msec; -} - -uint64_t time_to_usec(struct timespec t) -{ - uint64_t usec; - - usec = t.tv_nsec / 1000 + (uint64_t)t.tv_sec * 1000000; - return usec; + res.ts.tv_sec += TIMEREL_CHECK(t).ts.tv_sec * mult; + return TIMEREL_CHECK(res); } -uint64_t time_to_nsec(struct timespec t) +struct timespec time_check_(struct timespec t, const char *abortstr) { - uint64_t nsec; - - nsec = t.tv_nsec + (uint64_t)t.tv_sec * 1000000000; - return nsec; -} - -struct timespec time_from_msec(uint64_t msec) -{ - struct timespec t; - - t.tv_nsec = (msec % 1000) * 1000000; - t.tv_sec = msec / 1000; + 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; } -struct timespec time_from_usec(uint64_t usec) +struct timerel timerel_check(struct timerel t, const char *abortstr) { - struct timespec t; + struct timerel ret; - t.tv_nsec = (usec % 1000000) * 1000; - t.tv_sec = usec / 1000000; - return t; + ret.ts = time_check_(t.ts, abortstr); + return ret; } -struct timespec time_from_nsec(uint64_t nsec) +struct timeabs timeabs_check(struct timeabs t, const char *abortstr) { - struct timespec t; + struct timeabs ret; - t.tv_nsec = nsec % 1000000000; - t.tv_sec = nsec / 1000000000; - return t; + ret.ts = time_check_(t.ts, abortstr); + return ret; }