X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Ftools.c;h=4874fc62645fdff6aa372ecc6637227e6377865e;hp=d27db719e973034183a8fb7a5e837b2a481cf6e7;hb=e4142e580c36230a1e5137f8a5f5a5cc01a57a1e;hpb=63bceea014e091a2f2907e49f7c3b33f042106f4 diff --git a/tools/tools.c b/tools/tools.c index d27db719..4874fc62 100644 --- a/tools/tools.c +++ b/tools/tools.c @@ -1,8 +1,12 @@ -#include -#include +#include +#include #include +#include #include #include +#include +#include +#include #include #include #include @@ -12,53 +16,17 @@ #include #include #include -#include #include #include +#include #include "tools.h" -static char *tmpdir = NULL; +static const char *tmpdir = NULL; bool tools_verbose = false; /* Ten minutes. */ const unsigned int default_timeout_ms = 10 * 60 * 1000; -char *talloc_basename(const void *ctx, const char *dir) -{ - char *p = strrchr(dir, '/'); - - if (!p) - return talloc_strdup(ctx, dir); - return talloc_strdup(ctx, p+1); -} - -char *talloc_dirname(const void *ctx, const char *dir) -{ - char *p = strrchr(dir, '/'); - - if (!p) - return talloc_strdup(ctx, "."); - return talloc_strndup(ctx, dir, p - dir); -} - -char *talloc_getcwd(const void *ctx) -{ - unsigned int len; - char *cwd; - - /* *This* is why people hate C. */ - len = 32; - cwd = talloc_array(ctx, char, len); - while (!getcwd(cwd, len)) { - if (errno != ERANGE) { - talloc_free(cwd); - return NULL; - } - cwd = talloc_realloc(ctx, cwd, char, len *= 2); - } - return cwd; -} - static void killme(int sig) { kill(-getpid(), SIGKILL); @@ -69,26 +37,27 @@ char *run_with_timeout(const void *ctx, const char *cmd, { pid_t pid; int p[2]; - char *ret; + struct rbuf in; int status, ms; - struct timeval start, end; + struct timeabs start; + char *ret; *ok = false; if (pipe(p) != 0) - return talloc_asprintf(ctx, "Failed to create pipe: %s", - strerror(errno)); + return tal_fmt(ctx, "Failed to create pipe: %s", + strerror(errno)); 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]); close_noerr(p[1]); - return talloc_asprintf(ctx, "Failed to fork: %s", - strerror(errno)); - return NULL; + return tal_fmt(ctx, "Failed to fork: %s", strerror(errno)); } if (pid == 0) { @@ -103,8 +72,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 = timespec_to_timeval(time_from_msec(*timeout_ms).ts); setitimer(ITIMER_REAL, &itim, NULL); status = system(cmd); @@ -115,23 +83,19 @@ char *run_with_timeout(const void *ctx, const char *cmd, } close(p[1]); - ret = grab_fd(ctx, p[0], NULL); + rbuf_init(&in, p[0], tal_arr(ctx, char, 4096), 4096, tal_rbuf_enlarge); + ret = rbuf_read_str(&in, 0); + /* This shouldn't fail... */ 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_between(time_now(), start)); if (ms > *timeout_ms) *timeout_ms = 0; else *timeout_ms -= ms; - + close(p[0]); if (tools_verbose) { printf("%s", ret); printf("Finished: %u ms, %s %u\n", ms, @@ -143,38 +107,37 @@ char *run_with_timeout(const void *ctx, const char *cmd, return ret; } -/* Returns output if command fails. */ -char *run_command(const void *ctx, unsigned int *time_ms, const char *fmt, ...) +/* Tals *output off ctx; return false if command fails. */ +bool run_command(const void *ctx, unsigned int *time_ms, char **output, + const char *fmt, ...) { va_list ap; - char *cmd, *contents; + char *cmd; bool ok; unsigned int default_time = default_timeout_ms; if (!time_ms) time_ms = &default_time; - else if (*time_ms == 0) - return talloc_strdup(ctx, "\n== TIMED OUT ==\n"); + else if (*time_ms == 0) { + *output = tal_strdup(ctx, "\n== TIMED OUT ==\n"); + return false; + } va_start(ap, fmt); - cmd = talloc_vasprintf(ctx, fmt, ap); + cmd = tal_vfmt(ctx, fmt, ap); va_end(ap); - contents = run_with_timeout(ctx, cmd, &ok, time_ms); - if (ok) { - talloc_free(contents); - return NULL; - } - - if (!contents) + *output = run_with_timeout(ctx, cmd, &ok, time_ms); + if (ok) + return true; + if (!*output) err(1, "Problem running child"); if (*time_ms == 0) - contents = talloc_asprintf_append(contents, - "\n== TIMED OUT ==\n"); - return contents; + *output = tal_strcat(ctx, take(*output), "\n== TIMED OUT ==\n"); + return false; } -static int unlink_all(char *dir) +static void unlink_all(const char *dir) { char cmd[strlen(dir) + sizeof("rm -rf ")]; sprintf(cmd, "rm -rf %s", dir); @@ -182,72 +145,80 @@ static int unlink_all(char *dir) printf("Running: %s\n", cmd); if (system(cmd) != 0) warn("Could not remove temporary work in %s", dir); - return 0; } -char *temp_dir(const void *ctx) +static pid_t *afree; +static void free_autofree(void) +{ + if (*afree == getpid()) + tal_free(afree); +} + +tal_t *autofree(void) +{ + if (!afree) { + afree = tal(NULL, pid_t); + *afree = getpid(); + atexit(free_autofree); + } + return afree; +} + +const char *temp_dir(void) { /* For first call, create dir. */ while (!tmpdir) { tmpdir = getenv("TMPDIR"); if (!tmpdir) tmpdir = "/tmp"; - tmpdir = talloc_asprintf(talloc_autofree_context(), - "%s/ccanlint-%u.%lu", - tmpdir, getpid(), random()); + tmpdir = tal_fmt(autofree(), "%s/ccanlint-%u.%lu", + tmpdir, getpid(), random()); if (mkdir(tmpdir, 0700) != 0) { if (errno == EEXIST) { - talloc_free(tmpdir); + tal_free(tmpdir); tmpdir = NULL; continue; } err(1, "mkdir %s failed", tmpdir); } - talloc_set_destructor(tmpdir, unlink_all); + tal_add_destructor(tmpdir, unlink_all); if (tools_verbose) printf("Created temporary directory %s\n", tmpdir); } return tmpdir; } -char *maybe_temp_file(const void *ctx, const char *extension, bool keep, - const char *srcname) +void keep_temp_dir(void) { - size_t baselen; - char *f, *suffix = talloc_strdup(ctx, ""); + tal_del_destructor(temp_dir(), unlink_all); +} + +char *temp_file(const void *ctx, const char *extension, const char *srcname) +{ + char *f, *base, *suffix; struct stat st; unsigned int count = 0; - if (!keep) - srcname = talloc_basename(ctx, srcname); - else - assert(srcname[0] == '/'); - - if (strrchr(srcname, '.')) - baselen = strrchr(srcname, '.') - srcname; - else - baselen = strlen(srcname); + base = path_join(ctx, temp_dir(), take(path_basename(ctx, srcname))); + /* Trim extension. */ + base[path_ext_off(base)] = '\0'; + suffix = tal_strdup(ctx, extension); do { - f = talloc_asprintf(ctx, "%s/%.*s%s%s", - keep ? "" : temp_dir(ctx), - baselen, srcname, - suffix, extension); - talloc_free(suffix); - suffix = talloc_asprintf(ctx, "-%u", ++count); - } while (!keep && lstat(f, &st) == 0); + f = tal_strcat(ctx, base, suffix); + suffix = tal_fmt(base, "-%u%s", ++count, extension); + } while (lstat(f, &st) == 0); if (tools_verbose) printf("Creating file %s\n", f); - talloc_free(suffix); + tal_free(base); return f; } bool move_file(const char *oldname, const char *newname) { char *contents; - size_t size; int fd; bool ret; @@ -262,7 +233,7 @@ bool move_file(const char *oldname, const char *newname) } /* Try copy and delete: not atomic! */ - contents = grab_file(NULL, oldname, &size); + contents = grab_file(NULL, oldname); if (!contents) { if (tools_verbose) printf("read failed: %s\n", strerror(errno)); @@ -277,7 +248,7 @@ bool move_file(const char *oldname, const char *newname) goto free; } - ret = write_all(fd, contents, size); + ret = write_all(fd, contents, tal_count(contents)-1); if (close(fd) != 0) ret = false; @@ -292,6 +263,12 @@ bool move_file(const char *oldname, const char *newname) } free: - talloc_free(contents); + tal_free(contents); return ret; } + +void *tal_rbuf_enlarge(struct membuf *mb, void *p, size_t size) +{ + tal_resize((char **)&p, size); + return p; +}