X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb%2Ftest%2Fexternal-transaction.c;h=d899a6c669b01ef21621ae853437d561cd49689c;hp=c1442c215d6b0af3da35e4dff499c9b1c72cf6ae;hb=176844c84ff5ae6a5f146c5d1b7a3927bd781739;hpb=15758cca5f15f362edaf9da25f831d10e58b1b9a

diff --git a/ccan/tdb/test/external-transaction.c b/ccan/tdb/test/external-transaction.c
index c1442c21..d899a6c6 100644
--- a/ccan/tdb/test/external-transaction.c
+++ b/ccan/tdb/test/external-transaction.c
@@ -7,7 +7,10 @@
 #include <stdlib.h>
 #include <limits.h>
 #include <string.h>
+#include <errno.h>
 #include <ccan/tdb/tdb.h>
+#include <ccan/tap/tap.h>
+#include <stdio.h>
 
 static volatile sig_atomic_t alarmed;
 static void do_alarm(int signum)
@@ -15,15 +18,22 @@ static void do_alarm(int signum)
 	alarmed++;
 }
 
-static int do_transaction(const char *name)
+static int do_operation(enum operation op, const char *name)
 {
 	TDB_DATA k = { .dptr = (void *)"a", .dsize = 1 };
 	TDB_DATA d = { .dptr = (void *)"b", .dsize = 1 };
-	struct tdb_context *tdb = tdb_open(name, 0, 0, O_RDWR, 0);
+	struct tdb_context *tdb;
 
+	tdb = tdb_open(name, 0, op == OPEN_WITH_CLEAR_IF_FIRST ?
+		       TDB_CLEAR_IF_FIRST : TDB_DEFAULT, O_RDWR, 0);
 	if (!tdb)
 		return -1;
 
+	if (op == OPEN || op == OPEN_WITH_CLEAR_IF_FIRST) {
+		tdb_close(tdb);
+		return 0;
+	}
+
 	alarmed = 0;
 	tdb_setalarm_sigptr(tdb, &alarmed);
 
@@ -51,28 +61,33 @@ maybe_alarmed:
 	return -3;
 }
 
+struct agent {
+	int cmdfd, responsefd;
+};
 
-/* Do this before doing any tdb stuff.  Return handle, or -1. */
-int prepare_external_agent(void)
+/* Do this before doing any tdb stuff.  Return handle, or NULL. */
+struct agent *prepare_external_agent(void)
 {
 	int pid;
 	int command[2], response[2];
 	struct sigaction act = { .sa_handler = do_alarm };
-	char name[PATH_MAX];
+	char name[1+PATH_MAX];
 
 	if (pipe(command) != 0 || pipe(response) != 0)
-		return -1;
+		return NULL;
 
 	pid = fork();
 	if (pid < 0)
-		return -1;
+		return NULL;
 
 	if (pid != 0) {
+		struct agent *agent = malloc(sizeof(*agent));
+
 		close(command[0]);
 		close(response[1]);
-		/* FIXME: Make fds consective. */
-		dup2(command[1]+1, response[1]);
-		return command[1];
+		agent->cmdfd = command[1];
+		agent->responsefd = response[0];
+		return agent;
 	}
 
 	close(command[1]);
@@ -80,7 +95,9 @@ int prepare_external_agent(void)
 	sigaction(SIGALRM, &act, NULL);
 
 	while (read(command[0], name, sizeof(name)) != 0) {
-		int result = do_transaction(name);
+		int result;
+
+		result = do_operation(name[0], name+1);
 		if (write(response[1], &result, sizeof(result))
 		    != sizeof(result))
 			err(1, "Writing response");
@@ -88,16 +105,20 @@ int prepare_external_agent(void)
 	exit(0);
 }
 
-/* Ask the external agent to try to do a transaction. */
-bool external_agent_transaction(int handle, const char *tdbname)
+/* Ask the external agent to try to do an operation. */
+bool external_agent_operation(struct agent *agent,
+			      enum operation op, const char *tdbname)
 {
 	int res;
+	char string[1 + strlen(tdbname) + 1];
+
+	string[0] = op;
+	strcpy(string+1, tdbname);
 
-	if (write(handle, tdbname, strlen(tdbname)+1)
-	    != strlen(tdbname)+1)
+	if (write(agent->cmdfd, string, sizeof(string)) != sizeof(string))
 		err(1, "Writing to agent");
 
-	if (read(handle+1, &res, sizeof(res)) != sizeof(res))
+	if (read(agent->responsefd, &res, sizeof(res)) != sizeof(res))
 		err(1, "Reading from agent");
 
 	if (res > 1)
@@ -105,3 +126,41 @@ bool external_agent_transaction(int handle, const char *tdbname)
 
 	return res;
 }
+
+void external_agent_operation_start(struct agent *agent,
+				    enum operation op, const char *tdbname)
+{
+	char string[1 + strlen(tdbname) + 1];
+
+	string[0] = op;
+	strcpy(string+1, tdbname);
+
+	if (write(agent->cmdfd, string, sizeof(string)) != sizeof(string))
+		err(1, "Writing to agent");
+}
+
+bool external_agent_operation_check(struct agent *agent, bool block, int *res)
+{
+	int flags = fcntl(agent->responsefd, F_GETFL);
+
+	if (block)
+		fcntl(agent->responsefd, F_SETFL, flags & ~O_NONBLOCK);
+	else
+		fcntl(agent->responsefd, F_SETFL, flags | O_NONBLOCK);
+
+	switch (read(agent->responsefd, res, sizeof(*res))) {
+	case sizeof(*res):
+		break;
+	case 0:
+		errx(1, "Agent died?");
+	default:
+		if (!block && (errno == EAGAIN || errno == EWOULDBLOCK))
+			return false;
+		err(1, "%slocking reading from agent", block ? "B" : "Non-b");
+	}
+
+	if (*res > 1)
+		errx(1, "Agent returned %u\n", *res);
+
+	return true;
+}