lib: Created timeval_cmp_margin().

It's identical to timeval_cmp(), except that it ignores tv_usec differences
smaller than a specified margin.

diff --git a/src/lib/time-util.c b/src/lib/time-util.c
index d836686e0efad75bf9c2d60c27deb22e89b9b13d..e7832eb32fc1b72549331b827165318e68355677 100644 (file)
--- a/src/lib/time-util.c
+++ b/src/lib/time-util.c
@@ -20,6 +20,21 @@ int timeval_cmp(const struct timeval *tv1, const struct timeval *tv2)
        return 0;
 }
 
+int timeval_cmp_margin(const struct timeval *tv1, const struct timeval *tv2,
+       unsigned int usec_margin)
+{
+       if (tv1->tv_sec < tv2->tv_sec)
+               return -1;
+       if (tv1->tv_sec > tv2->tv_sec)
+               return 1;
+
+       if (tv1->tv_usec - tv2->tv_usec < (int)usec_margin)
+               return -1;
+       if (tv1->tv_usec - tv2->tv_usec > (int)usec_margin)
+               return -1;
+       return 0;
+}
+
 int timeval_diff_msecs(const struct timeval *tv1, const struct timeval *tv2)
 {
        return timeval_diff_usecs(tv1, tv2) / 1000;

diff --git a/src/lib/time-util.h b/src/lib/time-util.h
index 637fb5cc3dcf27b8314a9ebf648865fec47d3635..befeebb40ca23c8435510d7b545652db909251a0 100644 (file)
--- a/src/lib/time-util.h
+++ b/src/lib/time-util.h
@@ -5,6 +5,9 @@
 
 /* Returns -1 if tv1<tv2, 1 if tv1>tv2, 0 if they're equal. */
 int timeval_cmp(const struct timeval *tv1, const struct timeval *tv2);
+/* Same as timeval_cmp, but tv->usecs must differ by at least usec_margin */
+int timeval_cmp_margin(const struct timeval *tv1, const struct timeval *tv2,
+                      unsigned int usec_margin);
 /* Returns tv1-tv2 in milliseconds. */
 int timeval_diff_msecs(const struct timeval *tv1, const struct timeval *tv2);
 /* Returns tv1-tv2 in microseconds. */