From: Rusty Russell <rusty@rustcorp.com.au>
Date: Wed, 24 Aug 2011 03:22:04 +0000 (+0930)
Subject: ccanlint: use ccan/time
X-Git-Url: http://git.ozlabs.org/?p=ccan;a=commitdiff_plain;h=2bce880a453a64d2d1dfc2e48184553ff4f2550b

ccanlint: use ccan/time

Our own dogfood, and it's yummy!
---

diff --git a/tools/Makefile b/tools/Makefile
index 3ee60f7c..c942bdee 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -7,6 +7,7 @@ DEP_OBJS = ccan/grab_file/grab_file.o \
 	ccan/str/str.o \
 	ccan/str_talloc/str_talloc.o \
 	ccan/talloc/talloc.o \
+	ccan/time/time.o \
 	tools/compile.o \
 	tools/depends.o \
 	tools/tools.o
diff --git a/tools/ccanlint/Makefile b/tools/ccanlint/Makefile
index d7bd338b..846adf62 100644
--- a/tools/ccanlint/Makefile
+++ b/tools/ccanlint/Makefile
@@ -19,6 +19,7 @@ CORE_OBJS := \
 	ccan/str_talloc/str_talloc.o \
 	ccan/talloc/talloc.o \
 	ccan/talloc_link/talloc_link.o \
+	ccan/time/time.o \
 	tools/ccanlint/ccanlint.o \
 	tools/ccanlint/file_analysis.o \
 	tools/ccanlint/licenses.o \
diff --git a/tools/tools.c b/tools/tools.c
index 24e27ba1..0a29ddf8 100644
--- a/tools/tools.c
+++ b/tools/tools.c
@@ -3,6 +3,7 @@
 #include <ccan/noerr/noerr.h>
 #include <ccan/read_write_all/read_write_all.h>
 #include <ccan/noerr/noerr.h>
+#include <ccan/time/time.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/time.h>
@@ -72,7 +73,7 @@ char *run_with_timeout(const void *ctx, const char *cmd,
 	int p[2];
 	char *ret;
 	int status, ms;
-	struct timeval start, end;
+	struct timeval start;
 
 	*ok = false;
 	if (pipe(p) != 0)
@@ -84,7 +85,7 @@ char *run_with_timeout(const void *ctx, const char *cmd,
 
 	/* Always flush buffers before fork! */
 	fflush(stdout);
-	gettimeofday(&start, NULL);
+	start = time_now();
 	pid = fork();
 	if (pid == -1) {
 		close_noerr(p[0]);
@@ -106,8 +107,7 @@ char *run_with_timeout(const void *ctx, const char *cmd,
 
 		signal(SIGALRM, killme);
 		itim.it_interval.tv_sec = itim.it_interval.tv_usec = 0;
-		itim.it_value.tv_sec = *timeout_ms / 1000;
-		itim.it_value.tv_usec = (*timeout_ms % 1000) * 1000;
+		itim.it_value = time_from_msec(*timeout_ms);
 		setitimer(ITIMER_REAL, &itim, NULL);
 
 		status = system(cmd);
@@ -123,13 +123,7 @@ char *run_with_timeout(const void *ctx, const char *cmd,
 	if (waitpid(pid, &status, 0) != pid)
 		err(1, "Failed to wait for child");
 
-	gettimeofday(&end, NULL);
-	if (end.tv_usec < start.tv_usec) {
-		end.tv_usec += 1000000;
-		end.tv_sec--;
-	}
-	ms = (end.tv_sec - start.tv_sec) * 1000
-		+ (end.tv_usec - start.tv_usec) / 1000;
+	ms = time_to_msec(time_sub(time_now(), start));
 	if (ms > *timeout_ms)
 		*timeout_ms = 0;
 	else