X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Ftdb2%2Ftest%2Fexternal-agent.c;h=01c7106fba103892cedf0ec685745d382788c6fc;hb=fbae37ba91ec230e34be564084099726cc3a9d47;hp=055b5de736f6f04334fd990dc2409d1630650ff6;hpb=15cb319b3e5d07b70fb2fef7188c11c90d015de4;p=ccan

diff --git a/ccan/tdb2/test/external-agent.c b/ccan/tdb2/test/external-agent.c
index 055b5de7..01c7106f 100644
--- a/ccan/tdb2/test/external-agent.c
+++ b/ccan/tdb2/test/external-agent.c
@@ -10,21 +10,24 @@
 #include <limits.h>
 #include <string.h>
 #include <errno.h>
-#include <ccan/tdb2/private.h>
+#include <ccan/tdb2/tdb1_private.h>
 #include <ccan/tap/tap.h>
 #include <stdio.h>
 #include <stdarg.h>
 
 static struct tdb_context *tdb;
 
+void (*external_agent_free)(void *) = free;
+
 static enum TDB_ERROR clear_if_first(int fd, void *arg)
 {
-/* We hold a lock offset 63 always, so we can tell if anyone is holding it. */
+/* We hold a lock offset 4 always, so we can tell if anyone is holding it.
+ * (This is compatible with tdb1's TDB_CLEAR_IF_FIRST flag).  */
 	struct flock fl;
 
 	fl.l_type = F_WRLCK;
 	fl.l_whence = SEEK_SET;
-	fl.l_start = 63;
+	fl.l_start = 4;
 	fl.l_len = 1;
 
 	if (fcntl(fd, F_SETLK, &fl) == 0) {
@@ -99,10 +102,10 @@ static enum agent_return do_operation(enum operation op, const char *name)
 			ret = OTHER_FAILURE;
 		} else if (!tdb_deq(data, k)) {
 			ret = OTHER_FAILURE;
-			free(data.dptr);
+			external_agent_free(data.dptr);
 		} else {
 			ret = SUCCESS;
-			free(data.dptr);
+			external_agent_free(data.dptr);
 		}
 		break;
 	case STORE:
@@ -115,7 +118,10 @@ static enum agent_return do_operation(enum operation op, const char *name)
 		ret = tdb_transaction_commit(tdb)==0 ? SUCCESS : OTHER_FAILURE;
 		break;
 	case NEEDS_RECOVERY:
-		ret = tdb_needs_recovery(tdb) ? SUCCESS : FAILED;
+		if (tdb->flags & TDB_VERSION1)
+			ret = tdb1_needs_recovery(tdb) ? SUCCESS : FAILED;
+		else
+			ret = tdb_needs_recovery(tdb) ? SUCCESS : FAILED;
 		break;
 	case CHECK:
 		ret = tdb_check(tdb, NULL, NULL) == 0 ? SUCCESS : OTHER_FAILURE;