tdb2: simplify logging levels, rename TDB_DEBUG_* to TDB_LOG_*

[ccan] / ccan / tdb2 / tools / tdbtorture.c

diff --git a/ccan/tdb2/tools/tdbtorture.c b/ccan/tdb2/tools/tdbtorture.c
index 2ac9a8de43975a6b36220e5ebf1a1598c2acfa93..5dddf99a7cfa47d8807df251c3bc902a8e890fc5 100644 (file)
--- 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
@@ -50,15 +50,12 @@ static void tdb_log(struct tdb_context *tdb, enum tdb_debug_level level, void *p
 {
        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;
        }