X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ffailtest%2Ffailtest.c;h=c95a94f8d0ce4968dfe9266a47a68343c96b2fa9;hp=9972db3cd29fc8ad83a9d3c51bc8fedf65ef4a76;hb=407057edd6b45cae437d119df80ff080989a2752;hpb=c9f915e02c760caffe75da7f9a6a9a1de1bf1747 diff --git a/ccan/failtest/failtest.c b/ccan/failtest/failtest.c index 9972db3c..c95a94f8 100644 --- a/ccan/failtest/failtest.c +++ b/ccan/failtest/failtest.c @@ -1,3 +1,5 @@ +/* Licensed under LGPL - see LICENSE file for details */ +#include #include #include #include @@ -11,10 +13,11 @@ #include #include #include +#include #include +#include #include #include -#include #include enum failtest_result (*failtest_hook)(struct failtest_call *, unsigned); @@ -56,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. */ @@ -83,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) { @@ -142,11 +148,23 @@ static void child_fail(const char *out, size_t outlen, const char *fmt, ...) exit(1); } +static void trace(const char *fmt, ...) +{ + va_list ap; + + if (tracefd == -1) + return; + + va_start(ap, fmt); + vdprintf(tracefd, fmt, ap); + va_end(ap); +} + static pid_t child; -static void hand_down(int signal) +static void hand_down(int signum) { - kill(child, signal); + kill(child, signum); } static void release_locks(void) @@ -215,18 +233,6 @@ static void get_locks(void) lock_owner = getpid(); } -static void trace_str(const char *str) -{ - ssize_t ret; - - while ((ret = write(tracefd, str, strlen(str))) <= 0) { - str += ret; - if (!*str) - return; - } - err(1, "Writing trace."); -} - struct saved_file { struct saved_file *next; int fd; @@ -246,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; } @@ -291,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); @@ -300,6 +310,16 @@ static void restore_files(struct saved_file *s) } } +static void free_files(struct saved_file *s) +{ + while (s) { + struct saved_file *next = s->next; + free(s->contents); + free(s); + s = next; + } +} + /* Free up memory, so valgrind doesn't report leaks. */ static void free_everything(void) { @@ -317,21 +337,29 @@ static NORETURN void failtest_cleanup(bool forced_cleanup, int status) { int i; + /* For children, we don't care if they "failed" the testing. */ + if (control_fd != -1) + status = 0; + if (forced_cleanup) history_num--; /* Cleanup everything, in reverse order. */ - for (i = history_num - 1; i >= 0; i--) - if (history[i].cleanup) - history[i].cleanup(&history[i].u); + for (i = history_num - 1; i >= 0; i--) { + if (!history[i].cleanup) + continue; + if (!forced_cleanup) { + printf("Leak at %s:%u: --failpath=%s\n", + history[i].file, history[i].line, + failpath_string()); + status = 1; + } + history[i].cleanup(&history[i].u); + } free_everything(); - - if (control_fd == -1) - exit(status); - tell_parent(SUCCESS); - exit(0); + exit(status); } static bool should_fail(struct failtest_call *call) @@ -344,7 +372,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) @@ -354,11 +382,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; } } @@ -368,7 +400,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]) @@ -381,8 +413,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); } } @@ -390,17 +422,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(); } @@ -421,29 +458,20 @@ static bool should_fail(struct failtest_call *call) if (child == 0) { if (tracefd != -1) { - struct timeval now; - char str[50], *p; - gettimeofday(&now, NULL); - if (now.tv_usec < start.tv_usec) { - now.tv_sec--; - now.tv_usec += 1000000; - } - now.tv_usec -= start.tv_usec; - now.tv_sec -= start.tv_sec; - sprintf(str, "%u (%u.%02u): ", getpid(), - (int)now.tv_sec, (int)now.tv_usec / 10000); - trace_str(str); + struct timeval diff; + const char *p; + + diff = time_sub(time_now(), start); p = failpath_string(); - trace_str(p); - free(p); - trace_str("("); - p = strchr(history[history_num-1].file, '/'); + trace("%u->%u (%u.%02u): %s (", getppid(), getpid(), + (int)diff.tv_sec, (int)diff.tv_usec / 10000, p); + free((char *)p); + p = strrchr(history[history_num-1].file, '/'); if (p) - trace_str(p+1); + trace("%s", p+1); else - trace_str(history[history_num-1].file); - sprintf(str, ":%u)\n", history[history_num-1].line); - trace_str(str); + trace("%s", history[history_num-1].file); + trace(":%u)\n", history[history_num-1].line); } close(control[0]); close(output[0]); @@ -452,6 +480,8 @@ static bool should_fail(struct failtest_call *call) if (output[1] != STDOUT_FILENO && output[1] != STDERR_FILENO) close(output[1]); control_fd = control[1]; + /* Valgrind spots the leak if we don't free these. */ + free_files(files); return true; } @@ -476,8 +506,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; @@ -568,14 +603,14 @@ void *failtest_malloc(size_t size, const char *file, unsigned line) p = add_history(FAILTEST_MALLOC, file, line, &call); if (should_fail(p)) { - p->u.calloc.ret = NULL; + p->u.malloc.ret = NULL; p->error = ENOMEM; } else { - p->u.calloc.ret = malloc(size); + p->u.malloc.ret = malloc(size); set_cleanup(p, cleanup_malloc, struct malloc_call); } errno = p->error; - return p->u.calloc.ret; + return p->u.malloc.ret; } static void cleanup_realloc(struct realloc_call *call) @@ -657,7 +692,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); @@ -666,7 +701,7 @@ int failtest_open(const char *pathname, free((char *)call.pathname); p->u.open.ret = open(pathname, call.flags, call.mode); - if (!failpath && p->u.open.ret == -1) { + if (p->u.open.ret == -1) { p->fail = false; p->error = errno; } else if (should_fail(p)) { @@ -976,7 +1011,6 @@ int failtest_fcntl(int fd, const char *file, unsigned line, int cmd, ...) } p = add_history(FAILTEST_FCNTL, file, line, &call); - get_locks(); if (should_fail(p)) { p->u.fcntl.ret = -1; @@ -985,6 +1019,7 @@ int failtest_fcntl(int fd, const char *file, unsigned line, int cmd, ...) else p->error = EDEADLK; } else { + get_locks(); p->u.fcntl.ret = fcntl(p->u.fcntl.fd, p->u.fcntl.cmd, &p->u.fcntl.arg.fl); if (p->u.fcntl.ret == -1) @@ -1004,10 +1039,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="); @@ -1019,7 +1063,12 @@ void failtest_init(int argc, char *argv[]) debugpath = argv[i] + strlen("--debugpath="); } } - gettimeofday(&start, NULL); + start = time_now(); +} + +bool failtest_has_failed(void) +{ + return control_fd != -1; } void failtest_exit(int status)