X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Ffailtest%2Ffailtest.c;h=ab8e19cdb9caf60f1d8a9451e8225f874c7932e9;hb=f359fde1b7c3ca60faebd4df710bf30a68784e27;hp=b3ee0337ebd96cfb7fe9a3b7cd3114fe473404c8;hpb=48b700953f9c856102e91596103238f5da9ea079;p=ccan

diff --git a/ccan/failtest/failtest.c b/ccan/failtest/failtest.c
index b3ee0337..ab8e19cd 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 timeabs start;
 /* Set when failtest_hook returns FAIL_PROBE */
 static bool probing = false;
 /* Table to track duplicates. */
@@ -761,13 +761,13 @@ static bool should_fail(struct failtest_call *call)
 	if (child == 0) {
 		traceindent++;
 		if (tracef) {
-			struct timeval diff;
+			struct timerel diff;
 			const char *p;
 			char *failpath;
 			struct failtest_call *c;
 
 			c = tlist_tail(&history, list);
-			diff = time_sub(time_now(), start);
+			diff = time_between(time_now(), start);
 			failpath = failpath_string();
 			p = strrchr(c->file, '/');
 			if (p)
@@ -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.ts.tv_sec, (int)diff.ts.tv_nsec / 10000000,
 			      failpath, p, c->line);
 			free(failpath);
 		}
@@ -1260,7 +1260,7 @@ static ssize_t failtest_add_read(int fd, void *buf, size_t count, off_t off,
 				set_cleanup(p, cleanup_read, struct read_call);
 		}
 	}
-	trace("%sread %s:%u fd %i %zu@%llu -> %i\n",
+	trace("%sread %s:%u fd %i %zu@%llu -> %zi\n",
 	      is_pread ? "p" : "", file, line, fd, count, (long long)off,
 	      p->u.read.ret);
 	errno = p->error;
@@ -1362,7 +1362,7 @@ static ssize_t failtest_add_write(int fd, const void *buf,
 		else
 			p->u.write.ret = write(fd, buf, count);
 	}
-	trace("%swrite %s:%i %zu@%llu on fd %i -> %i\n",
+	trace("%swrite %s:%i %zu@%llu on fd %i -> %zi\n",
 	      p->u.write.is_pwrite ? "p" : "",
 	      file, line, count, (long long)off, fd, p->u.write.ret);
 	errno = p->error;