Change version number to 4.0.

[disorder] / lib / timeval.h

diff --git a/lib/timeval.h b/lib/timeval.h
index 9ec8c31038307b3245aed9c411fa46743fc57f46..10b02ea2080693692241ba8addf6aabd432e765d 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
@@ -21,6 +21,8 @@
 #ifndef TIMEVAL_H
 #define TIMEVAL_H
 
+#include <time.h>
+
 static inline struct timeval tvsub(const struct timeval a,
                                    const struct timeval b) {
   struct timeval r;
@@ -38,12 +40,64 @@ static inline struct timeval tvsub(const struct timeval a,
   return r;
 }
 
+static inline struct timeval tvadd(const struct timeval a,
+                                   const struct timeval b) {
+  struct timeval r;
+
+  r.tv_sec = a.tv_sec + b.tv_sec;
+  r.tv_usec = a.tv_usec + b.tv_usec;
+  if(r.tv_usec < 0) {
+    r.tv_usec += 1000000;
+    r.tv_sec--;
+  }
+  if(r.tv_usec > 999999) {
+    r.tv_usec -= 1000000;
+    r.tv_sec++;
+  }
+  return r;
+}
+
+static inline double tvdouble(const struct timeval a) {
+  return a.tv_sec + a.tv_usec / 1000000.0;
+}
+
 static inline int64_t tvsub_us(const struct timeval a,
                                const struct timeval b) {
   return (((uint64_t)a.tv_sec * 1000000 + a.tv_usec)
           - ((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 */
 
 /*