tdb: add -t (always transactional) to tdbtorture

diff --git a/ccan/tdb/tools/tdbtorture.c b/ccan/tdb/tools/tdbtorture.c
index 83a5c99e5e75fd20b1f34843639adbeac097ed46..e9c793ac89f08d2b7c34898f5f1e1820efb5fa38 100644 (file)
--- a/ccan/tdb/tools/tdbtorture.c
+++ b/ccan/tdb/tools/tdbtorture.c
@@ -35,6 +35,7 @@ static struct tdb_context *db;
 static int in_transaction;
 static int in_traverse;
 static int error_count;
 static int in_transaction;
 static int in_traverse;
 static int error_count;

+static int always_transaction = 0;

 
 #ifdef PRINTF_ATTRIBUTE
 static void tdb_log(struct tdb_context *tdb, enum tdb_debug_level level, const char *format, ...) PRINTF_ATTRIBUTE(3,4);
 
 #ifdef PRINTF_ATTRIBUTE
 static void tdb_log(struct tdb_context *tdb, enum tdb_debug_level level, const char *format, ...) PRINTF_ATTRIBUTE(3,4);


@@ -120,8 +121,15 @@ static void addrec_db(void)
        data.dptr = (unsigned char *)d;
        data.dsize = dlen+1;
 
        data.dptr = (unsigned char *)d;
        data.dsize = dlen+1;
 

+#if REOPEN_PROB
+       if (in_traverse == 0 && in_transaction == 0 && random() % REOPEN_PROB == 0) {
+               tdb_reopen_all(0);
+               goto next;
+       } 
+#endif
+

 #if TRANSACTION_PROB
 #if TRANSACTION_PROB

-       if (in_traverse == 0 && in_transaction == 0 && random() % TRANSACTION_PROB == 0) {
+       if (in_traverse == 0 && in_transaction == 0 && (always_transaction || random() % TRANSACTION_PROB == 0)) {

                if (tdb_transaction_start(db) != 0) {
                        fatal("tdb_transaction_start failed");
                }
                if (tdb_transaction_start(db) != 0) {
                        fatal("tdb_transaction_start failed");
                }


@@ -150,13 +158,6 @@ static void addrec_db(void)
        }
 #endif
 
        }
 #endif
 

-#if REOPEN_PROB
-       if (in_traverse == 0 && in_transaction == 0 && random() % REOPEN_PROB == 0) {
-               tdb_reopen_all(0);
-               goto next;
-       } 
-#endif
-

 #if DELETE_PROB
        if (random() % DELETE_PROB == 0) {
                tdb_delete(db, key);
 #if DELETE_PROB
        if (random() % DELETE_PROB == 0) {
                tdb_delete(db, key);


@@ -231,7 +232,7 @@ static int traverse_fn(struct tdb_context *tdb, TDB_DATA key, TDB_DATA dbuf,
 
 static void usage(void)
 {
 
 static void usage(void)
 {

-       printf("Usage: tdbtorture [-n NUM_PROCS] [-l NUM_LOOPS] [-s SEED] [-H HASH_SIZE]\n");
+       printf("Usage: tdbtorture [-t] [-n NUM_PROCS] [-l NUM_LOOPS] [-s SEED] [-H HASH_SIZE]\n");

        exit(0);
 }
 
        exit(0);
 }
 


@@ -248,7 +249,7 @@ int main(int argc, char * const *argv)
        struct tdb_logging_context log_ctx;
        log_ctx.log_fn = tdb_log;
 
        struct tdb_logging_context log_ctx;
        log_ctx.log_fn = tdb_log;
 

-       while ((c = getopt(argc, argv, "n:l:s:H:h")) != -1) {
+       while ((c = getopt(argc, argv, "n:l:s:H:th")) != -1) {

                switch (c) {
                case 'n':
                        num_procs = strtol(optarg, NULL, 0);
                switch (c) {
                case 'n':
                        num_procs = strtol(optarg, NULL, 0);


@@ -262,6 +263,9 @@ int main(int argc, char * const *argv)
                case 's':
                        seed = strtol(optarg, NULL, 0);
                        break;
                case 's':
                        seed = strtol(optarg, NULL, 0);
                        break;

+               case 't':
+                       always_transaction = 1;
+                       break;

                default:
                        usage();
                }
                default:
                        usage();
                }


@@ -287,8 +291,8 @@ int main(int argc, char * const *argv)
        }
 
        if (i == 0) {
        }
 
        if (i == 0) {

-               printf("testing with %d processes, %d loops, %d hash_size, seed=%d\n", 
-                      num_procs, num_loops, hash_size, seed);
+               printf("testing with %d processes, %d loops, %d hash_size, seed=%d%s\n", 
+                      num_procs, num_loops, hash_size, seed, always_transaction ? " (all within transactions)" : "");

        }
 
        srand(seed + i);
        }
 
        srand(seed + i);


@@ -300,8 +304,20 @@ int main(int argc, char * const *argv)
 
        if (error_count == 0) {
                tdb_traverse_read(db, NULL, NULL);
 
        if (error_count == 0) {
                tdb_traverse_read(db, NULL, NULL);

+               if (always_transaction) {
+                       while (in_transaction) {
+                               tdb_transaction_cancel(db);
+                               in_transaction--;
+                       }
+                       if (tdb_transaction_start(db) != 0)
+                               fatal("tdb_transaction_start failed");
+               }

                tdb_traverse(db, traverse_fn, NULL);
                tdb_traverse(db, traverse_fn, NULL);
                tdb_traverse(db, traverse_fn, NULL);
                tdb_traverse(db, traverse_fn, NULL);

+               if (always_transaction) {
+                       if (tdb_transaction_commit(db) != 0)
+                               fatal("tdb_transaction_commit failed");
+               }

        }
 
        tdb_close(db);
        }
 
        tdb_close(db);