X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Ftools.c;h=0a29ddf8e64cce7875a8a9d8c8fe37a0c6d90a13;hp=eeaff6f17f644233f7aa1772ab27c69aad69f81f;hb=380372e733416c2b348d5307f536d0a0807e95df;hpb=03a596908b779bbb4b7c2f739c5e238f8c5d6390

diff --git a/tools/tools.c b/tools/tools.c
index eeaff6f1..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>
@@ -15,9 +16,10 @@
 #include <err.h>
 #include <unistd.h>
 #include <assert.h>
+#include <signal.h>
 #include "tools.h"
 
-static char *tmpdir = NULL;
+static const char *tmpdir = NULL;
 bool tools_verbose = false;
 
 /* Ten minutes. */
@@ -71,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)
@@ -81,7 +83,9 @@ char *run_with_timeout(const void *ctx, const char *cmd,
 	if (tools_verbose)
 		printf("Running: %s\n", cmd);
 
-	gettimeofday(&start, NULL);
+	/* Always flush buffers before fork! */
+	fflush(stdout);
+	start = time_now();
 	pid = fork();
 	if (pid == -1) {
 		close_noerr(p[0]);
@@ -103,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);
@@ -120,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
@@ -174,7 +171,7 @@ bool run_command(const void *ctx, unsigned int *time_ms, char **output,
 	return false;
 }
 
-static int unlink_all(char *dir)
+static int unlink_all(const char *dir)
 {
 	char cmd[strlen(dir) + sizeof("rm -rf ")];
 	sprintf(cmd, "rm -rf %s", dir);
@@ -185,7 +182,7 @@ static int unlink_all(char *dir)
 	return 0;
 }
 
-char *temp_dir(const void *ctx)
+const char *temp_dir(const void *ctx)
 {
 	/* For first call, create dir. */
 	while (!tmpdir) {
@@ -210,6 +207,12 @@ char *temp_dir(const void *ctx)
 	return tmpdir;
 }
 
+int unlink_file_destructor(char *filename)
+{
+	unlink(filename);
+	return 0;
+}
+
 char *maybe_temp_file(const void *ctx, const char *extension, bool keep,
 		      const char *srcname)
 {
@@ -218,11 +221,7 @@ char *maybe_temp_file(const void *ctx, const char *extension, bool keep,
 	struct stat st;
 	unsigned int count = 0;
 
-	if (!keep)
-		srcname = talloc_basename(ctx, srcname);
-	else
-		assert(srcname[0] == '/');
-
+	srcname = talloc_basename(ctx, srcname);
 	if (strrchr(srcname, '.'))
 		baselen = strrchr(srcname, '.') - srcname;
 	else
@@ -230,7 +229,7 @@ char *maybe_temp_file(const void *ctx, const char *extension, bool keep,
 
 	do {
 		f = talloc_asprintf(ctx, "%s/%.*s%s%s",
-				    keep ? "" : temp_dir(ctx),
+				    temp_dir(ctx),
 				    baselen, srcname,
 				    suffix, extension);
 		talloc_free(suffix);
@@ -238,7 +237,10 @@ char *maybe_temp_file(const void *ctx, const char *extension, bool keep,
 	} while (lstat(f, &st) == 0);
 
 	if (tools_verbose)
-		printf("Creating file %s\n", f);
+		printf("Creating %sfile %s\n", keep ? "" : "temporary ", f);
+
+	if (!keep)
+		talloc_set_destructor(f, unlink_file_destructor);
 
 	talloc_free(suffix);
 	return f;