From: Rusty Russell <rusty@rustcorp.com.au>
Date: Tue, 10 Jun 2014 03:36:16 +0000 (+0930)
Subject: strset: update ccan/time usage in tools
X-Git-Url: http://git.ozlabs.org/?p=ccan;a=commitdiff_plain;h=c0117ccb503af9b067695441199a71db8846a296

strset: update ccan/time usage in tools

Broken since commit 2012d45e273c3016dbd09b2606efc9ffab07c57f
which switched to timespec.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
---

diff --git a/ccan/strset/tools/cbspeed.c b/ccan/strset/tools/cbspeed.c
index a1766490..3018da98 100644
--- a/ccan/strset/tools/cbspeed.c
+++ b/ccan/strset/tools/cbspeed.c
@@ -381,23 +381,17 @@ return allprefixed_traverse(top,handle,arg);
 /* end critbit */
 
 /* Nanoseconds per operation */
-static size_t normalize(const struct timeval *start,
-			const struct timeval *stop,
+static size_t normalize(const struct timespec *start,
+			const struct timespec *stop,
 			unsigned int num)
 {
-	struct timeval diff;
-
-	timersub(stop, start, &diff);
-
-	/* Floating point is more accurate here. */
-	return (double)(diff.tv_sec * 1000000 + diff.tv_usec)
-		/ num * 1000;
+	return time_to_nsec(time_divide(time_sub(*stop, *start), num));
 }
 
 int main(int argc, char *argv[])
 {
 	size_t i, j, num;
-	struct timeval start, stop;
+	struct timespec start, stop;
 	critbit0_tree ct;
 	char **words, **misswords;
 
diff --git a/ccan/strset/tools/speed.c b/ccan/strset/tools/speed.c
index 9edb0718..8c815699 100644
--- a/ccan/strset/tools/speed.c
+++ b/ccan/strset/tools/speed.c
@@ -32,23 +32,17 @@
 #include <sys/time.h>
 
 /* Nanoseconds per operation */
-static size_t normalize(const struct timeval *start,
-			const struct timeval *stop,
+static size_t normalize(const struct timespec *start,
+			const struct timespec *stop,
 			unsigned int num)
 {
-	struct timeval diff;
-
-	timersub(stop, start, &diff);
-
-	/* Floating point is more accurate here. */
-	return (double)(diff.tv_sec * 1000000 + diff.tv_usec)
-		/ num * 1000;
+	return time_to_nsec(time_divide(time_sub(*stop, *start), num));
 }
 
 int main(int argc, char *argv[])
 {
 	size_t i, j, num;
-	struct timeval start, stop;
+	struct timespec start, stop;
 	struct strset set;
 	char **words, **misswords;