X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb%2Ftest%2Frun-traverse-in-transaction.c;h=61cb13155bb102dc0a345de2950f189b9f3b2772;hp=0a74055b6b0b778f35f0d81d327e31acd1723d64;hb=c4c5fed020ba44b9930119672a36a1cb33aff090;hpb=b86f8688feef575cb0c69b964a47fa1167cde528

diff --git a/ccan/tdb/test/run-traverse-in-transaction.c b/ccan/tdb/test/run-traverse-in-transaction.c
index 0a74055b..61cb1315 100644
--- a/ccan/tdb/test/run-traverse-in-transaction.c
+++ b/ccan/tdb/test/run-traverse-in-transaction.c
@@ -1,4 +1,6 @@
 #define _XOPEN_SOURCE 500
+#include "lock-tracking.h"
+#define fcntl fcntl_with_lockcheck
 #include <ccan/tdb/tdb.h>
 #include <ccan/tdb/io.c>
 #include <ccan/tdb/tdb.c>
@@ -9,11 +11,14 @@
 #include <ccan/tdb/error.c>
 #include <ccan/tdb/open.c>
 #include <ccan/tdb/check.c>
+#include <ccan/tdb/hash.c>
 #include <ccan/tap/tap.h>
+#undef fcntl_with_lockcheck
 #include <stdlib.h>
 #include <stdbool.h>
 #include <err.h>
-#include "external-transaction.h"
+#include "external-agent.h"
+#include "logging.h"
 
 static struct agent *agent;
 
@@ -47,8 +52,9 @@ int main(int argc, char *argv[])
 	if (!agent)
 		err(1, "preparing agent");
 
-	tdb = tdb_open("/tmp/test2.tdb", 1024, TDB_CLEAR_IF_FIRST,
-		       O_CREAT|O_TRUNC|O_RDWR, 0600);
+	tdb = tdb_open_ex("run-traverse-in-transaction.tdb",
+			  1024, TDB_CLEAR_IF_FIRST, O_CREAT|O_TRUNC|O_RDWR,
+			  0600, &taplogctx, NULL);
 	ok1(tdb);
 
 	key.dsize = strlen("hi");
@@ -58,21 +64,25 @@ int main(int argc, char *argv[])
 
 	ok1(tdb_store(tdb, key, data, TDB_INSERT) == 0);
 
-	ok1(external_agent_operation(agent, TRANSACTION, tdb_name(tdb)));
+	ok1(external_agent_operation(agent, OPEN, tdb_name(tdb)) == SUCCESS);
 
 	ok1(tdb_transaction_start(tdb) == 0);
-	ok1(!external_agent_operation(agent, TRANSACTION, tdb_name(tdb)));
+	ok1(external_agent_operation(agent, TRANSACTION_START, tdb_name(tdb))
+	    == WOULD_HAVE_BLOCKED);
 	tdb_traverse(tdb, traverse, NULL);
 
 	/* That should *not* release the transaction lock! */
-	ok1(!external_agent_operation(agent, TRANSACTION, tdb_name(tdb)));
+	ok1(external_agent_operation(agent, TRANSACTION_START, tdb_name(tdb))
+	    == WOULD_HAVE_BLOCKED);
 	tdb_traverse_read(tdb, traverse, NULL);
 
 	/* That should *not* release the transaction lock! */
-	ok1(!external_agent_operation(agent, TRANSACTION, tdb_name(tdb)));
+	ok1(external_agent_operation(agent, TRANSACTION_START, tdb_name(tdb))
+	    == WOULD_HAVE_BLOCKED);
 	ok1(tdb_transaction_commit(tdb) == 0);
 	/* Now we should be fine. */
-	ok1(external_agent_operation(agent, TRANSACTION, tdb_name(tdb)));
+	ok1(external_agent_operation(agent, TRANSACTION_START, tdb_name(tdb))
+	    == SUCCESS);
 
 	tdb_close(tdb);