X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb2%2Ftest%2Frun-tdb1-no-lock-during-traverse.c;h=b2b7a781db602d690184035ee09f8ddddb07d049;hp=cb1c23606b24a14a54ff92bb60655d6902fd62b5;hb=380372e733416c2b348d5307f536d0a0807e95df;hpb=a446f1d4d161d66bbb19ba2551cf6429a4865964

diff --git a/ccan/tdb2/test/run-tdb1-no-lock-during-traverse.c b/ccan/tdb2/test/run-tdb1-no-lock-during-traverse.c
index cb1c2360..b2b7a781 100644
--- a/ccan/tdb2/test/run-tdb1-no-lock-during-traverse.c
+++ b/ccan/tdb2/test/run-tdb1-no-lock-during-traverse.c
@@ -25,7 +25,7 @@ static bool prepare_entries(struct tdb_context *tdb)
 		data.dsize = strlen("world");
 		data.dptr = (void *)"world";
 
-		if (tdb1_store(tdb, key, data, 0) != 0)
+		if (tdb_store(tdb, key, data, 0) != TDB_SUCCESS)
 			return false;
 	}
 	return true;
@@ -40,7 +40,7 @@ static void delete_entries(struct tdb_context *tdb)
 		key.dsize = sizeof(i);
 		key.dptr = (void *)&i;
 
-		ok1(tdb1_delete(tdb, key) == 0);
+		ok1(tdb_delete(tdb, key) == TDB_SUCCESS);
 	}
 }
 
@@ -52,7 +52,7 @@ static int delete_other(struct tdb_context *tdb, TDB_DATA key, TDB_DATA data,
 	memcpy(&i, key.dptr, 4);
 	i = (i + 1) % NUM_ENTRIES;
 	key.dptr = (void *)&i;
-	if (tdb1_delete(tdb, key) != 0)
+	if (tdb_delete(tdb, key) != TDB_SUCCESS)
 		(*(int *)private_data)++;
 	return 0;
 }
@@ -60,7 +60,7 @@ static int delete_other(struct tdb_context *tdb, TDB_DATA key, TDB_DATA data,
 static int delete_self(struct tdb_context *tdb, TDB_DATA key, TDB_DATA data,
 			void *private_data)
 {
-	ok1(tdb1_delete(tdb, key) == 0);
+	ok1(tdb_delete(tdb, key) == TDB_SUCCESS);
 	return 0;
 }
 
@@ -68,39 +68,44 @@ int main(int argc, char *argv[])
 {
 	struct tdb_context *tdb;
 	int errors = 0;
+	union tdb_attribute hsize;
 
-	plan_tests(41);
-	tdb = tdb1_open("run-no-lock-during-traverse.tdb",
-			1024, TDB_DEFAULT, O_CREAT|O_TRUNC|O_RDWR,
-			0600, &tap_log_attr);
+	hsize.base.attr = TDB_ATTRIBUTE_TDB1_HASHSIZE;
+	hsize.base.next = &tap_log_attr;
+	hsize.tdb1_hashsize.hsize = 1024;
+
+	plan_tests(40);
+	tdb = tdb_open("run-no-lock-during-traverse.tdb1",
+		       TDB_VERSION1, O_CREAT|O_TRUNC|O_RDWR,
+		       0600, &hsize);
 
 	ok1(tdb);
 	ok1(prepare_entries(tdb));
 	ok1(locking_errors1 == 0);
-	ok1(tdb1_lockall(tdb) == 0);
+	ok1(tdb_lockall(tdb) == 0);
 	ok1(locking_errors1 == 0);
-	tdb1_traverse(tdb, delete_other, &errors);
+	ok1(tdb_traverse(tdb, delete_other, &errors) >= 0);
 	ok1(errors == 0);
 	ok1(locking_errors1 == 0);
-	ok1(tdb1_unlockall(tdb) == 0);
+	tdb_unlockall(tdb);
 
 	ok1(prepare_entries(tdb));
 	ok1(locking_errors1 == 0);
-	ok1(tdb1_lockall(tdb) == 0);
+	ok1(tdb_lockall(tdb) == 0);
 	ok1(locking_errors1 == 0);
-	tdb1_traverse(tdb, delete_self, NULL);
+	ok1(tdb_traverse(tdb, delete_self, NULL) == NUM_ENTRIES);
 	ok1(locking_errors1 == 0);
-	ok1(tdb1_unlockall(tdb) == 0);
+	tdb_unlockall(tdb);
 
 	ok1(prepare_entries(tdb));
 	ok1(locking_errors1 == 0);
-	ok1(tdb1_lockall(tdb) == 0);
+	ok1(tdb_lockall(tdb) == 0);
 	ok1(locking_errors1 == 0);
 	delete_entries(tdb);
 	ok1(locking_errors1 == 0);
-	ok1(tdb1_unlockall(tdb) == 0);
+	tdb_unlockall(tdb);
 
-	ok1(tdb1_close(tdb) == 0);
+	ok1(tdb_close(tdb) == 0);
 
 	return exit_status();
 }