X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Ffailtest%2Ffailtest.c;h=9ecc535a3fb73ac736f7474e88508c950fba1345;hb=c96ab569e73791eabe62e8d1c88b913e89eddc49;hp=56a1ad1872f9f584b9fda6bbf9f21d10e6f3c0b3;hpb=5adceea6af51c93d3b6fc39849ff05340cd87253;p=ccan

diff --git a/ccan/failtest/failtest.c b/ccan/failtest/failtest.c
index 56a1ad18..9ecc535a 100644
--- a/ccan/failtest/failtest.c
+++ b/ccan/failtest/failtest.c
@@ -25,6 +25,7 @@ static int tracefd = -1;
 unsigned int failtest_timeout_ms = 20000;
 
 const char *failpath;
+const char *debugpath;
 
 enum info_type {
 	WRITE,
@@ -55,7 +56,7 @@ static pid_t lock_owner;
 static struct lock_info *locks = NULL;
 static unsigned int lock_num = 0;
 
-static const char info_to_arg[] = "mceoprwf";
+static const char info_to_arg[] = "mceoxprwf";
 
 /* Dummy call used for failtest_undo wrappers. */
 static struct failtest_call unrecorded_call;
@@ -329,6 +330,29 @@ static bool should_fail(struct failtest_call *call)
 		}
 	}
 
+	/* Attach debugger if they asked for it. */
+	if (debugpath && history_num == strlen(debugpath)) {
+		unsigned int i;
+
+		for (i = 0; i < history_num; i++) {
+			char c = info_to_arg[history[i].type];
+			if (history[i].fail)
+				c = toupper(c);
+			if (c != debugpath[i])
+				break;
+		}
+		if (i == history_num) {
+			char str[80];
+
+			/* Don't timeout. */
+			signal(SIGUSR1, SIG_IGN);
+			sprintf(str, "xterm -e gdb /proc/%d/exe %d &",
+				getpid(), getpid());
+			system(str);
+			sleep(5);
+		}
+	}
+
 	if (!failtest_hook(history, history_num)) {
 		call->fail = false;
 		return false;
@@ -431,9 +455,13 @@ static bool should_fail(struct failtest_call *call)
 	close(output[0]);
 	close(control[0]);
 	waitpid(child, &status, 0);
-	if (!WIFEXITED(status))
-		child_fail(out, outlen, "Killed by signal %u: ",
-			   WTERMSIG(status));
+	if (!WIFEXITED(status)) {
+		if (WTERMSIG(status) == SIGUSR1)
+			child_fail(out, outlen, "Timed out");
+		else
+			child_fail(out, outlen, "Killed by signal %u: ",
+				   WTERMSIG(status));
+	}
 	/* Child printed failure already, just pass up exit code. */
 	if (type == FAILURE) {
 		fprintf(stderr, "%.*s", (int)outlen, out);
@@ -588,12 +616,17 @@ int failtest_open(const char *pathname,
 	/* Avoid memory leak! */
 	if (p == &unrecorded_call)
 		free((char *)call.pathname);
-	if (should_fail(p)) {
+	p->u.open.ret = open(pathname, call.flags, call.mode);
+
+	if (!failpath && p->u.open.ret == -1) {
+		p->fail = false;
+		p->error = errno;
+	} else if (should_fail(p)) {
+		close(p->u.open.ret);
 		p->u.open.ret = -1;
 		/* FIXME: Play with error codes? */
 		p->error = EACCES;
 	} else {
-		p->u.open.ret = open(pathname, call.flags, call.mode);
 		set_cleanup(p, cleanup_open, struct open_call);
 	}
 	errno = p->error;
@@ -663,8 +696,9 @@ ssize_t failtest_pwrite(int fd, const void *buf, size_t count, off_t off,
 	call.off = off;
 	p = add_history(FAILTEST_WRITE, file, line, &call);
 
-	/* If we're a child, tell parent about write. */
-	if (control_fd != -1) {
+	/* If we're a child, we need to make sure we write the same thing
+	 * to non-files as the parent does, so tell it. */
+	if (control_fd != -1 && off == (off_t)-1) {
 		enum info_type type = WRITE;
 
 		write_all(control_fd, &type, sizeof(type));
@@ -678,7 +712,7 @@ ssize_t failtest_pwrite(int fd, const void *buf, size_t count, off_t off,
 		p->error = EIO;
 	} else {
 		/* FIXME: We assume same write order in parent and child */
-		if (child_writes_num != 0) {
+		if (off == (off_t)-1 && child_writes_num != 0) {
 			if (child_writes[0].fd != fd)
 				errx(1, "Child wrote to fd %u, not %u?",
 				     child_writes[0].fd, fd);
@@ -791,9 +825,20 @@ add_lock(struct lock_info *locks, int fd, off_t start, off_t end, int type)
 }
 
 /* We trap this so we can record it: we don't fail it. */
-int failtest_close(int fd)
+int failtest_close(int fd, const char *file, unsigned line)
 {
 	int i;
+	struct close_call call;
+	struct failtest_call *p;
+
+	call.fd = fd;
+	p = add_history(FAILTEST_CLOSE, file, line, &call);
+	p->fail = false;
+
+	/* Consume close from failpath. */
+	if (failpath)
+		if (should_fail(p))
+			abort();
 
 	if (fd < 0)
 		return close(fd);
@@ -921,6 +966,9 @@ void failtest_init(int argc, char *argv[])
 		} else if (strcmp(argv[i], "--tracepath") == 0) {
 			tracefd = dup(STDERR_FILENO);
 			failtest_timeout_ms = -1;
+		} else if (!strncmp(argv[i], "--debugpath=",
+				    strlen("--debugpath="))) {
+			debugpath = argv[i] + strlen("--debugpath=");
 		}
 	}
 	gettimeofday(&start, NULL);
@@ -943,16 +991,16 @@ void failtest_exit(int status)
 {
 	int i;
 
-	if (control_fd == -1) {
-		free_everything();
-		exit(status);
-	}
-
 	if (failtest_exit_check) {
 		if (!failtest_exit_check(history, history_num))
 			child_fail(NULL, 0, "failtest_exit_check failed\n");
 	}
 
+	if (control_fd == -1) {
+		free_everything();
+		exit(status);
+	}
+
 	/* Cleanup everything, in reverse order. */
 	for (i = history_num - 1; i >= 0; i--)
 		if (history[i].cleanup)