Merge event scheduling implementation. This fixes defect #6,

[disorder] / lib / timeval.h

diff --git a/lib/timeval.h b/lib/timeval.h
index 16c08e98368ed266cadc92d7ae82f07cde67364a..c2cd10696f4b9cbc6bfc7902290f1f3c03d06093 100644 (file)
--- a/lib/timeval.h
+++ b/lib/timeval.h
@@ -1,6 +1,6 @@
 /*
  * This file is part of DisOrder.
- * Copyright (C) 2007 Richard Kettlewell
+ * Copyright (C) 2007, 2008 Richard Kettlewell
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -65,6 +65,37 @@ static inline int64_t tvsub_us(const struct timeval a,
           - ((uint64_t)b.tv_sec * 1000000 + b.tv_usec));
 }
 
+/** @brief Great-than comparison for timevals */
+static inline int tvgt(const struct timeval *a, const struct timeval *b) {
+  if(a->tv_sec > b->tv_sec)
+    return 1;
+  if(a->tv_sec == b->tv_sec
+     && a->tv_usec > b->tv_usec)
+    return 1;
+  return 0;
+}
+
+/** @brief Less-than
+    comparison for timevals */
+static inline int tvlt(const struct timeval *a, const struct timeval *b) {
+  if(a->tv_sec < b->tv_sec)
+    return 1;
+  if(a->tv_sec == b->tv_sec
+     && a->tv_usec < b->tv_usec)
+    return 1;
+  return 0;
+}
+
+/** @brief Greater-than-or-equal comparison for timevals */
+static inline int tvge(const struct timeval *a, const struct timeval *b) {
+  return !tvlt(a, b);
+}
+
+/** @brief Less-than-or-equal comparison for timevals */
+static inline int tvle(const struct timeval *a, const struct timeval *b) {
+  return !tvgt(a, b);
+}
+
 #endif /* TIMEVAL_H */
 
 /*