X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Ffailtest%2Ffailtest.c;h=2471510614a070c6c404e04d51789bbc28a8536e;hb=18631151c81a92341d26cee6f3b125191f3d5c41;hp=30903e3f3c4ecf232d474e2d09bc82f5238e777c;hpb=36264d9553f924c8a58ae967f659601d1ff6793a;p=ccan

diff --git a/ccan/failtest/failtest.c b/ccan/failtest/failtest.c
index 30903e3f..24715106 100644
--- a/ccan/failtest/failtest.c
+++ b/ccan/failtest/failtest.c
@@ -12,6 +12,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 +58,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. */
@@ -676,7 +679,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);
@@ -1023,10 +1026,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=");
@@ -1041,6 +1053,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) {