X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Ftools.c;h=a4944bd1f8988b43cf63e63ac42460a0d1643529;hp=6e19f96128b0eb624e2f2d8edaa85e28f24e2c43;hb=04d31dd269ab901ac3de7a1290ed6a87bdea206a;hpb=304652023042670b3173de0ad5dc0eb7c836618c

diff --git a/tools/tools.c b/tools/tools.c
index 6e19f961..a4944bd1 100644
--- a/tools/tools.c
+++ b/tools/tools.c
@@ -13,10 +13,12 @@
 #include <stdarg.h>
 #include <errno.h>
 #include <err.h>
+#include <unistd.h>
 #include "tools.h"
 
 static char *tmpdir = NULL;
 static unsigned int count;
+bool tools_verbose = false;
 
 /* Ten minutes. */
 const unsigned int default_timeout_ms = 10 * 60 * 1000;
@@ -26,7 +28,7 @@ char *talloc_basename(const void *ctx, const char *dir)
 	char *p = strrchr(dir, '/');
 
 	if (!p)
-		return (char *)dir;
+		return talloc_strdup(ctx, dir);
 	return talloc_strdup(ctx, p+1);
 }
 
@@ -57,10 +59,13 @@ char *talloc_getcwd(const void *ctx)
 	return cwd;
 }
 
-static char *run_with_timeout(const void *ctx,
-			      const char *cmd,
-			      bool *ok,
-			      unsigned *timeout_ms)
+static void killme(int sig)
+{
+	kill(-getpid(), SIGKILL);
+}
+
+char *run_with_timeout(const void *ctx, const char *cmd,
+		       bool *ok, unsigned *timeout_ms)
 {
 	pid_t pid;
 	int p[2];
@@ -73,6 +78,10 @@ static char *run_with_timeout(const void *ctx,
 		return talloc_asprintf(ctx, "Failed to create pipe: %s",
 				       strerror(errno));
 
+	if (tools_verbose)
+		printf("Running: %s\n", cmd);
+
+	gettimeofday(&start, NULL);
 	pid = fork();
 	if (pid == -1) {
 		close_noerr(p[0]);
@@ -92,6 +101,7 @@ static char *run_with_timeout(const void *ctx,
 		    || open("/dev/null", O_RDONLY) != STDIN_FILENO)
 			exit(128);
 
+		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;
@@ -105,17 +115,12 @@ static char *run_with_timeout(const void *ctx,
 	}
 
 	close(p[1]);
-	gettimeofday(&start, NULL);
 	ret = grab_fd(ctx, p[0], NULL);
 	/* This shouldn't fail... */
 	if (waitpid(pid, &status, 0) != pid)
 		err(1, "Failed to wait for child");
 
 	gettimeofday(&end, NULL);
-	if (WIFSIGNALED(status)) {
-		*timeout_ms = 0;
-		return ret;
-	}
 	if (end.tv_usec < start.tv_usec) {
 		end.tv_usec += 1000000;
 		end.tv_sec--;
@@ -127,7 +132,14 @@ static char *run_with_timeout(const void *ctx,
 	else
 		*timeout_ms -= ms;
 
-	*ok = (WEXITSTATUS(status) == 0);
+	if (tools_verbose) {
+		printf("%s", ret);
+		printf("Finished: %u ms, %s %u\n", ms,
+		       WIFEXITED(status) ? "exit status" : "killed by signal",
+		       WIFEXITED(status) ? WEXITSTATUS(status)
+		       : WTERMSIG(status));
+	}
+	*ok = (WIFEXITED(status) && WEXITSTATUS(status) == 0);
 	return ret;
 }
 
@@ -141,6 +153,8 @@ char *run_command(const void *ctx, unsigned int *time_ms, const char *fmt, ...)
 
 	if (!time_ms)
 		time_ms = &default_time;
+	else if (*time_ms == 0)
+		return talloc_strdup(ctx, "\n== TIMED OUT ==\n");
 
 	va_start(ap, fmt);
 	cmd = talloc_vasprintf(ctx, fmt, ap);
@@ -155,7 +169,8 @@ char *run_command(const void *ctx, unsigned int *time_ms, const char *fmt, ...)
 	if (!contents)
 		err(1, "Problem running child");
 	if (*time_ms == 0)
-		talloc_asprintf_append(contents, "\n== TIMED OUT ==\n");
+		contents = talloc_asprintf_append(contents,
+						  "\n== TIMED OUT ==\n");
 	return contents;
 }
 
@@ -163,12 +178,14 @@ static int unlink_all(char *dir)
 {
 	char cmd[strlen(dir) + sizeof("rm -rf ")];
 	sprintf(cmd, "rm -rf %s", dir);
+	if (tools_verbose)
+		printf("Running: %s\n", cmd);
 	if (system(cmd) != 0)
 		warn("Could not remove temporary work in %s", dir);
 	return 0;
 }
 
-char *temp_file(const void *ctx, const char *extension)
+char *temp_dir(const void *ctx)
 {
 	/* For first call, create dir. */
 	while (!tmpdir) {
@@ -187,9 +204,35 @@ char *temp_file(const void *ctx, const char *extension)
 			err(1, "mkdir %s failed", tmpdir);
 		}
 		talloc_set_destructor(tmpdir, unlink_all);
+		if (tools_verbose)
+			printf("Created temporary directory %s\n", tmpdir);
 	}
+	return tmpdir;
+}
 
-	return talloc_asprintf(ctx, "%s/%u%s", tmpdir, count++, extension);
+char *temp_file(const void *ctx, const char *extension)
+{
+	char *f = talloc_asprintf(ctx, "%s/%u%s",
+				  temp_dir(ctx), count++, extension);
+	if (tools_verbose)
+		printf("Created temporary file %s\n", f);
+	return f;
+}
+
+char *maybe_temp_file(const void *ctx, const char *extension, bool keep,
+		      const char *srcname)
+{
+	size_t baselen;
+	char *f;
+
+	if (!keep)
+		return temp_file(ctx, extension);
+
+	baselen = strrchr(srcname, '.') - srcname;
+	f = talloc_asprintf(ctx, "%.*s%s", baselen, srcname, extension);
+	if (tools_verbose)
+		printf("Creating file %s\n", f);
+	return f;
 }
 
 bool move_file(const char *oldname, const char *newname)
@@ -199,17 +242,28 @@ bool move_file(const char *oldname, const char *newname)
 	int fd;
 	bool ret;
 
+	if (tools_verbose)
+		printf("Moving file %s to %s: ", oldname, newname);
+
 	/* Simple case: rename works. */
-	if (rename(oldname, newname) == 0)
+	if (rename(oldname, newname) == 0) {
+		if (tools_verbose)
+			printf("rename worked\n");
 		return true;
+	}
 
 	/* Try copy and delete: not atomic! */
 	contents = grab_file(NULL, oldname, &size);
-	if (!contents)
+	if (!contents) {
+		if (tools_verbose)
+			printf("read failed: %s\n", strerror(errno));
 		return false;
+	}
 
 	fd = open(newname, O_WRONLY|O_CREAT|O_TRUNC, 0666);
 	if (fd < 0) {
+		if (tools_verbose)
+			printf("output open failed: %s\n", strerror(errno));
 		ret = false;
 		goto free;
 	}
@@ -218,10 +272,15 @@ bool move_file(const char *oldname, const char *newname)
 	if (close(fd) != 0)
 		ret = false;
 
-	if (ret)
+	if (ret) {
+		if (tools_verbose)
+			printf("copy worked\n");
 		unlink(oldname);
-	else
+	} else {
+		if (tools_verbose)
+			printf("write/close failed\n");
 		unlink(newname);
+	}
 
 free:
 	talloc_free(contents);