failtest: fix silent exit when top-level return FAIL_PROBE

[ccan] / ccan / failtest / failtest.c

diff --git a/ccan/failtest/failtest.c b/ccan/failtest/failtest.c
index 3f64bc91b512e35cb05a812979118ee06b9b1280..91420dc699b9c7fdf7f40171b1e39d5fbb7d7ef3 100644 (file)
--- 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 <stdarg.h>
 #include <string.h>
@@ -12,6 +13,7 @@
 #include <sys/wait.h>
 #include <sys/stat.h>
 #include <sys/time.h>
+#include <signal.h>
 #include <assert.h>
 #include <ccan/read_write_all/read_write_all.h>
 #include <ccan/failtest/failtest_proto.h>
@@ -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,7 +372,10 @@ static bool should_fail(struct failtest_call *call)
                /* + means continue after end, like normal. */
                if (*failpath == '+')
                        failpath = NULL;
-               else {
+               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",
@@ -390,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);
                }
        }
 
@@ -399,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();
                }
@@ -481,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;
@@ -662,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);
@@ -1009,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=");
@@ -1027,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) {