X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ffailtest%2Ffailtest.c;h=91420dc699b9c7fdf7f40171b1e39d5fbb7d7ef3;hp=061d6e9e3fc911c12c88fe7b122a417287441133;hb=03f017e9aff901d5d80bd577732543961a13c497;hpb=9660f0f1cbbdfd6473f033ca816fbf64fd8ce869

diff --git a/ccan/failtest/failtest.c b/ccan/failtest/failtest.c
index 061d6e9e..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 <stdarg.h>
 #include <string.h>
@@ -58,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. */
@@ -359,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)
@@ -409,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();
 		}
@@ -1024,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=");
@@ -1042,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) {