X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb2%2Ftest%2Frun-02-expand.c;h=0a1bc99176e4a2c2795fcffd0d50e75b19ab4851;hp=b681c05c1b6a5519e173d4d88541a3634a8593c3;hb=2b5cb9bd6be4e61870ba7a400d1a9d91c5933371;hpb=d1383862ad9a74e713dc915d351b74da4db35078

diff --git a/ccan/tdb2/test/run-02-expand.c b/ccan/tdb2/test/run-02-expand.c
index b681c05c..0a1bc991 100644
--- a/ccan/tdb2/test/run-02-expand.c
+++ b/ccan/tdb2/test/run-02-expand.c
@@ -1,11 +1,26 @@
+#include <ccan/failtest/failtest_override.h>
 #include <ccan/tdb2/tdb.c>
 #include <ccan/tdb2/free.c>
 #include <ccan/tdb2/lock.c>
 #include <ccan/tdb2/io.c>
 #include <ccan/tdb2/check.c>
+#include <ccan/tdb2/transaction.c>
 #include <ccan/tdb2/hash.c>
 #include <ccan/tap/tap.h>
+#include <ccan/failtest/failtest.h>
 #include "logging.h"
+#include "failtest_helper.h"
+
+static bool failtest_suppress = false;
+
+/* Don't need to test everything here, just want expand testing. */
+static enum failtest_result
+suppress_failure(struct failtest_call *history, unsigned num)
+{
+	if (failtest_suppress)
+		return FAIL_DONT_FAIL;
+	return block_repeat_failures(history, num);
+}
 
 int main(int argc, char *argv[])
 {
@@ -16,59 +31,49 @@ int main(int argc, char *argv[])
 			TDB_INTERNAL|TDB_CONVERT, TDB_CONVERT,
 			TDB_NOMMAP|TDB_CONVERT };
 
-	plan_tests(sizeof(flags) / sizeof(flags[0]) * 18 + 1);
+	plan_tests(sizeof(flags) / sizeof(flags[0]) * 11 + 1);
+
+	failtest_init(argc, argv);
+	failtest_hook = suppress_failure;
+	failtest_exit_check = exit_check_log;
 
 	for (i = 0; i < sizeof(flags) / sizeof(flags[0]); i++) {
+		failtest_suppress = true;
 		tdb = tdb_open("run-expand.tdb", flags[i],
 			       O_RDWR|O_CREAT|O_TRUNC, 0600, &tap_log_attr);
-		ok1(tdb);
-		if (!tdb)
-			continue;
-
-		/* First expand. Should not fill zone. */
-		val = tdb->map_size - sizeof(struct tdb_header);
-		ok1(tdb_expand(tdb, 1) == 0);
-		ok1(tdb->map_size < sizeof(struct tdb_header)
-		    + (1 << INITIAL_ZONE_BITS));
-		ok1(tdb_check(tdb, NULL, NULL) == 0);
-
-		/* Fill zone. */
-		val = (1<<INITIAL_ZONE_BITS)
-			- sizeof(struct tdb_used_record)
-			- (tdb->map_size - sizeof(struct tdb_header));
-		ok1(tdb_expand(tdb, val) == 0);
-		ok1(tdb->map_size == sizeof(struct tdb_header)
-		    + (1 << INITIAL_ZONE_BITS));
-		ok1(tdb_check(tdb, NULL, NULL) == 0);
+		if (!ok1(tdb))
+			break;
 
-		/* Second expand, adds another zone of same size. */
-		ok1(tdb_expand(tdb, 4 << INITIAL_ZONE_BITS) == 0);
-		ok1(tdb->map_size ==
-		    (2<<INITIAL_ZONE_BITS) + sizeof(struct tdb_header));
+		val = tdb->map_size;
+		/* Need some hash lock for expand. */
+		ok1(tdb_lock_hashes(tdb, 0, 1, F_WRLCK, TDB_LOCK_WAIT) == 0);
+		failtest_suppress = false;
+		if (!ok1(tdb_expand(tdb, 1) == 0)) {
+			failtest_suppress = true;
+			tdb_close(tdb);
+			break;
+		}
+		failtest_suppress = true;
+			
+		ok1(tdb->map_size >= val + 1 * TDB_EXTENSION_FACTOR);
+		ok1(tdb_unlock_hashes(tdb, 0, 1, F_WRLCK) == 0);
 		ok1(tdb_check(tdb, NULL, NULL) == 0);
 
-		/* Large expand now will double file. */
-		ok1(tdb_expand(tdb, 4 << INITIAL_ZONE_BITS) == 0);
-		ok1(tdb->map_size ==
-		    (4<<INITIAL_ZONE_BITS) + sizeof(struct tdb_header));
+		val = tdb->map_size;
+		ok1(tdb_lock_hashes(tdb, 0, 1, F_WRLCK, TDB_LOCK_WAIT) == 0);
+		failtest_suppress = false;
+		if (!ok1(tdb_expand(tdb, 1024) == 0)) {
+			failtest_suppress = true;
+			tdb_close(tdb);
+			break;
+		}
+		failtest_suppress = true;
+		ok1(tdb_unlock_hashes(tdb, 0, 1, F_WRLCK) == 0);
+		ok1(tdb->map_size >= val + 1024 * TDB_EXTENSION_FACTOR);
 		ok1(tdb_check(tdb, NULL, NULL) == 0);
-
-		/* And again? */
-		ok1(tdb_expand(tdb, 4 << INITIAL_ZONE_BITS) == 0);
-		ok1(tdb->map_size ==
-		    (8<<INITIAL_ZONE_BITS) + sizeof(struct tdb_header));
-		ok1(tdb_check(tdb, NULL, NULL) == 0);
-
-		/* Below comfort level, won't fill zone. */
-		ok1(tdb_expand(tdb,
-			       ((3 << INITIAL_ZONE_BITS)
-				>> TDB_COMFORT_FACTOR_BITS)
-			       - sizeof(struct tdb_used_record)) == 0);
-		ok1(tdb->map_size < (12<<INITIAL_ZONE_BITS)
-		    + sizeof(struct tdb_header));
 		tdb_close(tdb);
 	}
 
 	ok1(tap_log_messages == 0);
-	return exit_status();
+	failtest_exit(exit_status());
 }