X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ffailtest%2Ffailtest.c;h=91420dc699b9c7fdf7f40171b1e39d5fbb7d7ef3;hp=4f7542f5b16b44f6c8a794cb66033f1f45030c16;hb=03f017e9aff901d5d80bd577732543961a13c497;hpb=1ac26f37368b33e0952e19df05184776c80159c8 diff --git a/ccan/failtest/failtest.c b/ccan/failtest/failtest.c index 4f7542f5..91420dc6 100644 --- a/ccan/failtest/failtest.c +++ b/ccan/failtest/failtest.c @@ -1,3 +1,4 @@ +/* Licensed under LGPL - see LICENSE file for details */ #include "config.h" #include #include @@ -12,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -57,6 +59,8 @@ static pid_t lock_owner; static struct lock_info *locks = NULL; static unsigned int lock_num = 0; +static pid_t orig_pid; + static const char info_to_arg[] = "mceoxprwf"; /* Dummy call used for failtest_undo wrappers. */ @@ -84,8 +88,9 @@ static struct failtest_call *add_history_(enum failtest_call_type type, #define add_history(type, file, line, elem) \ add_history_((type), (file), (line), (elem), sizeof(*(elem))) +/* We do a fake call inside a sizeof(), to check types. */ #define set_cleanup(call, clean, type) \ - (call)->cleanup = (void *)((void)sizeof(clean((type *)NULL)), (clean)) + (call)->cleanup = (void *)((void)sizeof(clean((type *)NULL),1), (clean)) static bool read_write_info(int fd) { @@ -247,7 +252,8 @@ static struct saved_file *save_file(struct saved_file *next, int fd) s->len = lseek(fd, 0, SEEK_END); lseek(fd, 0, SEEK_SET); s->contents = malloc(s->len); - read(fd, s->contents, s->len); + if (read(fd, s->contents, s->len) != s->len) + err(1, "Failed to save %zu bytes", (size_t)s->len); lseek(fd, s->off, SEEK_SET); return s; } @@ -292,8 +298,11 @@ static void restore_files(struct saved_file *s) struct saved_file *next = s->next; lseek(s->fd, 0, SEEK_SET); - write(s->fd, s->contents, s->len); - ftruncate(s->fd, s->len); + if (write(s->fd, s->contents, s->len) != s->len) + err(1, "Failed to restore %zu bytes", (size_t)s->len); + if (ftruncate(s->fd, s->len) != 0) + err(1, "Failed to trim file to length %zu", + (size_t)s->len); free(s->contents); lseek(s->fd, s->off, SEEK_SET); free(s); @@ -330,8 +339,9 @@ static NORETURN void failtest_cleanup(bool forced_cleanup, int status) if (!history[i].cleanup) continue; if (!forced_cleanup) { - printf("Leak at %s:%u\n", - history[i].file, history[i].line); + printf("Leak at %s:%u: --failpath=%s\n", + history[i].file, history[i].line, + failpath_string()); status = 1; } history[i].cleanup(&history[i].u); @@ -352,7 +362,7 @@ static bool should_fail(struct failtest_call *call) struct saved_file *files; /* Are we probing? */ - if (probe_count && --probe_count == 0) + if (probe_count && --probe_count == 0 && control_fd != -1) failtest_cleanup(true, 0); if (call == &unrecorded_call) @@ -362,11 +372,15 @@ static bool should_fail(struct failtest_call *call) /* + means continue after end, like normal. */ if (*failpath == '+') failpath = NULL; - else { - if (tolower(*failpath) != info_to_arg[call->type]) + else if (*failpath == '\0') { + /* Continue, but don't inject errors. */ + return call->fail = false; + } else { + if (tolower((unsigned char)*failpath) + != info_to_arg[call->type]) errx(1, "Failpath expected '%c' got '%c'\n", info_to_arg[call->type], *failpath); - call->fail = isupper(*(failpath++)); + call->fail = isupper((unsigned char)*(failpath++)); return call->fail; } } @@ -376,7 +390,7 @@ static bool should_fail(struct failtest_call *call) unsigned int i; for (i = 0; i < history_num; i++) { - char c = info_to_arg[history[i].type]; + unsigned char c = info_to_arg[history[i].type]; if (history[i].fail) c = toupper(c); if (c != debugpath[i]) @@ -389,8 +403,8 @@ static bool should_fail(struct failtest_call *call) signal(SIGUSR1, SIG_IGN); sprintf(str, "xterm -e gdb /proc/%d/exe %d &", getpid(), getpid()); - system(str); - sleep(5); + if (system(str) == 0) + sleep(5); } } @@ -398,17 +412,22 @@ static bool should_fail(struct failtest_call *call) switch (failtest_hook(history, history_num)) { case FAIL_OK: break; + case FAIL_PROBE: + /* Already down probe path? Stop now. */ + if (!probe_count) { + /* FIXME: We should run *parent* and + * run probe until calls match up again. */ + probe_count = 3; + break; + } else { + /* Child should give up now. */ + if (control_fd != -1) + failtest_cleanup(true, 0); + /* Parent, don't fail again. */ + } case FAIL_DONT_FAIL: call->fail = false; return false; - case FAIL_PROBE: - /* Already down probe path? Stop now. */ - if (probe_count) - failtest_cleanup(true, 0); - /* FIXME: We should run *parent* and run probe until - * calls match up again. */ - probe_count = 3; - break; default: abort(); } @@ -430,7 +449,7 @@ static bool should_fail(struct failtest_call *call) if (child == 0) { if (tracefd != -1) { struct timeval now; - char *p; + const char *p; gettimeofday(&now, NULL); if (now.tv_usec < start.tv_usec) { now.tv_sec--; @@ -441,7 +460,7 @@ static bool should_fail(struct failtest_call *call) p = failpath_string(); trace("%u->%u (%u.%02u): %s (", getppid(), getpid(), (int)now.tv_sec, (int)now.tv_usec / 10000, p); - free(p); + free((char *)p); p = strrchr(history[history_num-1].file, '/'); if (p) trace("%s", p+1); @@ -480,8 +499,13 @@ static bool should_fail(struct failtest_call *call) else ret = poll(pfd, 2, failtest_timeout_ms); - if (ret <= 0) + if (ret == 0) hand_down(SIGUSR1); + if (ret < 0) { + if (errno == EINTR) + continue; + err(1, "Poll returned %i", ret); + } if (pfd[0].revents & POLLIN) { ssize_t len; @@ -661,7 +685,7 @@ int failtest_open(const char *pathname, va_start(ap, line); call.flags = va_arg(ap, int); if (call.flags & O_CREAT) { - call.mode = va_arg(ap, mode_t); + call.mode = va_arg(ap, int); va_end(ap); } p = add_history(FAILTEST_OPEN, file, line, &call); @@ -1008,10 +1032,19 @@ int failtest_fcntl(int fd, const char *file, unsigned line, int cmd, ...) return p->u.fcntl.ret; } +pid_t failtest_getpid(const char *file, unsigned line) +{ + /* You must call failtest_init first! */ + assert(orig_pid); + return orig_pid; +} + void failtest_init(int argc, char *argv[]) { unsigned int i; + orig_pid = getpid(); + for (i = 1; i < argc; i++) { if (!strncmp(argv[i], "--failpath=", strlen("--failpath="))) { failpath = argv[i] + strlen("--failpath="); @@ -1026,6 +1059,11 @@ void failtest_init(int argc, char *argv[]) gettimeofday(&start, NULL); } +bool failtest_has_failed(void) +{ + return control_fd != -1; +} + void failtest_exit(int status) { if (failtest_exit_check) {