X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb2%2Ftools%2Ftdbtorture.c;h=5dddf99a7cfa47d8807df251c3bc902a8e890fc5;hp=46dc1c72ab70a98a2d3f9095d827bc513190f1f3;hb=587982955ca9c61363d6e3004622ee97eda80e4b;hpb=e2cb71e5d46801a94a3f0f546b8dcc2b7a79b66c

diff --git a/ccan/tdb2/tools/tdbtorture.c b/ccan/tdb2/tools/tdbtorture.c
index 46dc1c72..5dddf99a 100644
--- a/ccan/tdb2/tools/tdbtorture.c
+++ b/ccan/tdb2/tools/tdbtorture.c
@@ -20,8 +20,8 @@
 #define DELETE_PROB 8
 #define STORE_PROB 4
 #define APPEND_PROB 6
-//#define TRANSACTION_PROB 10
-//#define TRANSACTION_PREPARE_PROB 2
+#define TRANSACTION_PROB 10
+#define TRANSACTION_PREPARE_PROB 2
 #define LOCKSTORE_PROB 5
 #define TRAVERSE_PROB 20
 #define TRAVERSE_READ_PROB 20
@@ -43,22 +43,19 @@ static int count_pipe;
 static union tdb_attribute log_attr;
 static union tdb_attribute seed_attr;
 
-#ifdef PRINTF_ATTRIBUTE
-static void tdb_log(struct tdb_context *tdb, enum tdb_debug_level level, void *private, const char *format, ...) PRINTF_ATTRIBUTE(4,5);
+#ifdef PRINTF_FMT
+static void tdb_log(struct tdb_context *tdb, enum tdb_debug_level level, void *private, const char *format, ...) PRINTF_FMT(4,5);
 #endif
 static void tdb_log(struct tdb_context *tdb, enum tdb_debug_level level, void *private, const char *format, ...)
 {
 	va_list ap;
 
-	if (level != TDB_DEBUG_TRACE)
-		error_count++;
-
 	va_start(ap, format);
 	vfprintf(stdout, format, ap);
 	va_end(ap);
 	fflush(stdout);
 #if 0
-	if (level != TDB_DEBUG_TRACE) {
+	{
 		char *ptr;
 		signal(SIGUSR1, SIG_IGN);
 		asprintf(&ptr,"xterm -e gdb /proc/%d/exe %d", getpid(), getpid());
@@ -171,9 +168,7 @@ static void addrec_db(void)
 	}
 
 	if (in_traverse == 0 && in_transaction && random() % TRANSACTION_PROB == 0) {
-		if (tdb_transaction_cancel(db) != 0) {
-			fatal("tdb_transaction_cancel failed");
-		}
+		tdb_transaction_cancel(db);
 		in_transaction--;
 		goto next;
 	}