int main(void)
{
struct timeabs t1, t2, epoch = { { 0, 0 } };
+ struct timemono t1m, t2m;
struct timerel t3, t4, zero = { { 0, 0 } };
int fds[2];
- plan_tests(64);
+ plan_tests(69);
/* Test time_now */
t1 = time_now();
ok1(timerel_eq(t3, t3));
ok1(!timerel_eq(t3, zero));
+ /* Test time_mono */
+ t1m = time_mono();
+ t2m = time_mono();
+
+ ok1(!time_less_(t2m.ts, t1m.ts));
+
+ t3.ts.tv_sec = 1;
+ t3.ts.tv_nsec = 0;
+
+ ok1(time_less(timemono_between(t2m, t1m), t3));
+ ok1(time_less(timemono_since(t1m), t3));
+
+ ok1(timemono_add(t1m, t3).ts.tv_sec == t1m.ts.tv_sec + 1);
+ ok1(timemono_add(t2m, t3).ts.tv_nsec == t2m.ts.tv_nsec);
+
/* Make sure t2 > t1. */
t3.ts.tv_sec = 0;
t3.ts.tv_nsec = 1;
timerel_check((t), __FILE__ ":" stringify(__LINE__) " (" stringify(t) ") ")
#define TIMEABS_CHECK(t) \
timeabs_check((t), __FILE__ ":" stringify(__LINE__) " (" stringify(t) ") ")
+#define TIMEMONO_CHECK(t) \
+ timemono_check((t), __FILE__ ":" stringify(__LINE__) " (" stringify(t) ") ")
#else
#define TIME_CHECK(t) (t)
#define TIMEREL_CHECK(t) (t)
#define TIMEABS_CHECK(t) (t)
+#define TIMEMONO_CHECK(t) (t)
#endif
/**
/**
* timeabs_check - check if an absolute time is malformed.
- * @in: the relative time to check (returned)
+ * @in: the absolute time to check (returned)
* @abortstr: the string to print to stderr before aborting (if set).
*
* This can be used to make sure a time isn't negative and doesn't
*/
struct timeabs timeabs_check(struct timeabs in, const char *abortstr);
+/**
+ * timemono_check - check if a monotonic time is malformed.
+ * @in: the monotonic time to check (returned)
+ * @abortstr: the string to print to stderr before aborting (if set).
+ *
+ * This can be used to make sure a time isn't negative and doesn't
+ * have a tv_nsec >= 1000000000. If it is, and @abortstr is non-NULL,
+ * that will be printed and abort() is called. Otherwise, if
+ * @abortstr is NULL then the returned timemono will be normalized and
+ * tv_sec set to 0 if it was negative.
+ *
+ * Note that if ccan/time is compiled with DEBUG, then it will call this
+ * for all passed and returned times.
+ *
+ * Example:
+ * printf("Now is %lu seconds since mono start\n",
+ * (long)timemono_check(time_mono(), "time_mono failed?").ts.tv_sec);
+ */
+struct timemono timemono_check(struct timemono in, const char *abortstr);
+
/**
* time_now - return the current time
*
&& a.ts.tv_nsec == b.ts.tv_nsec;
}
+/**
+ * timemono_eq - is a equal to b?
+ * @a: one monotonic time.
+ * @b: another monotonic time.
+ *
+ * Example:
+ * #include <sys/types.h>
+ * #include <sys/wait.h>
+ *
+ * // Can we fork in under a nanosecond?
+ * static bool fast_fork(void)
+ * {
+ * struct timemono start = time_mono();
+ * if (fork() != 0) {
+ * exit(0);
+ * }
+ * wait(NULL);
+ * return timemono_eq(start, time_mono());
+ * }
+ */
+static inline bool timemono_eq(struct timemono a, struct timemono b)
+{
+ return TIMEMONO_CHECK(a).ts.tv_sec == TIMEMONO_CHECK(b).ts.tv_sec
+ && a.ts.tv_nsec == b.ts.tv_nsec;
+}
+
/**
* timerel_eq - is a equal to b?
* @a: one relative time.
{
struct timemono now = time_mono();
- return timemono_between(now, old);
+ return timemono_between(now, TIMEMONO_CHECK(old));
}
/**