From b980b856670208893a4ac597c3b2e8dec47f453d Mon Sep 17 00:00:00 2001
From: Rusty Russell <rusty@rustcorp.com.au>
Date: Mon, 10 Sep 2012 15:44:54 +0930
Subject: [PATCH] failtest, tools: update for new timespec-using ccan/time
 module.

---
 ccan/failtest/failtest.c | 6 +++---
 tools/Makefile           | 2 +-
 tools/ccanlint/async.c   | 2 +-
 tools/tools.c            | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ccan/failtest/failtest.c b/ccan/failtest/failtest.c
index b3ee0337..ed9e1e98 100644
--- a/ccan/failtest/failtest.c
+++ b/ccan/failtest/failtest.c
@@ -91,7 +91,7 @@ static int control_fd = -1;
 /* If we're a child, this is the first call we did ourselves. */
 static struct failtest_call *our_history_start = NULL;
 /* For printing runtime with --trace. */
-static struct timeval start;
+static struct timespec start;
 /* Set when failtest_hook returns FAIL_PROBE */
 static bool probing = false;
 /* Table to track duplicates. */
@@ -761,7 +761,7 @@ static bool should_fail(struct failtest_call *call)
 	if (child == 0) {
 		traceindent++;
 		if (tracef) {
-			struct timeval diff;
+			struct timespec diff;
 			const char *p;
 			char *failpath;
 			struct failtest_call *c;
@@ -776,7 +776,7 @@ static bool should_fail(struct failtest_call *call)
 				p = c->file;
 			trace("%u->%u (%u.%02u): %s (%s:%u)\n",
 			      getppid(), getpid(),
-			      (int)diff.tv_sec, (int)diff.tv_usec / 10000,
+			      (int)diff.tv_sec, (int)diff.tv_nsec / 10000000,
 			      failpath, p, c->line);
 			free(failpath);
 		}
diff --git a/tools/Makefile b/tools/Makefile
index 4bc7497a..da235327 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -1,5 +1,5 @@
 ALL_TOOLS = tools/configurator/configurator tools/ccan_depends tools/doc_extract tools/namespacize tools/ccanlint/ccanlint
-
+LDLIBS = -lrt
 DEP_OBJS = ccan/grab_file/grab_file.o \
 	ccan/noerr/noerr.o \
 	ccan/read_write_all/read_write_all.o \
diff --git a/tools/ccanlint/async.c b/tools/ccanlint/async.c
index 4f51dd62..680f947c 100644
--- a/tools/ccanlint/async.c
+++ b/tools/ccanlint/async.c
@@ -70,7 +70,7 @@ static void run_more(void)
 
 			signal(SIGALRM, killme);
 			itim.it_interval.tv_sec = itim.it_interval.tv_usec = 0;
-			itim.it_value = time_from_msec(c->time_ms);
+			itim.it_value = timespec_to_timeval(time_from_msec(c->time_ms));
 			setitimer(ITIMER_REAL, &itim, NULL);
 
 			c->status = system(c->command);
diff --git a/tools/tools.c b/tools/tools.c
index 1eddf7e9..5b6581e5 100644
--- a/tools/tools.c
+++ b/tools/tools.c
@@ -73,7 +73,7 @@ char *run_with_timeout(const void *ctx, const char *cmd,
 	int p[2];
 	char *ret;
 	int status, ms;
-	struct timeval start;
+	struct timespec start;
 
 	*ok = false;
 	if (pipe(p) != 0)
@@ -106,7 +106,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 = time_from_msec(*timeout_ms);
+		itim.it_value = timespec_to_timeval(time_from_msec(*timeout_ms));
 		setitimer(ITIMER_REAL, &itim, NULL);
 
 		status = system(cmd);
-- 
2.39.2