1 files changed, 65 insertions, 20 deletions

diff --git a/source/tdb/tdbtorture.c b/source/tdb/tdbtorture.c
index 1a3b715402d..0cdb60db6ee 100644
--- a/source/tdb/tdbtorture.c
+++ b/source/tdb/tdbtorture.c
@@ -1,4 +1,5 @@
 #include <stdlib.h>
+#include <time.h>
 #include <stdio.h>
 #include <fcntl.h>
 #include <unistd.h>
@@ -17,12 +18,15 @@
 
 
 
-#define DELETE_PROB 10
-#define STORE_PROB 3
-#define TRAVERSE_PROB 8
-#define CULL_PROB 60
+#define REOPEN_PROB 30
+#define DELETE_PROB 8
+#define STORE_PROB 4
+#define LOCKSTORE_PROB 0
+#define TRAVERSE_PROB 20
+#define CULL_PROB 100
 #define KEYLEN 3
 #define DATALEN 100
+#define LOCKLEN 20
 
 static TDB_CONTEXT *db;
 
@@ -33,12 +37,13 @@ static void tdb_log(TDB_CONTEXT *tdb, int level, const char *format, ...)
 	va_start(ap, format);
 	vfprintf(stdout, format, ap);
 	va_end(ap);
+	fflush(stdout);
 #if 0
 	{
 		char *ptr;
 		asprintf(&ptr,"xterm -e gdb /proc/%d/exe %d", getpid(), getpid());
 		system(ptr);
-		free(ptr);
+		SAFE_FREE(ptr);
 	}
 #endif	
 }
@@ -62,26 +67,28 @@ static char *randbuf(int len)
 	return buf;
 }
 
-static int cull_traverse(TDB_CONTEXT *db, TDB_DATA key, TDB_DATA dbuf,
+static int cull_traverse(TDB_CONTEXT *tdb, TDB_DATA key, TDB_DATA dbuf,
 			 void *state)
 {
 	if (random() % CULL_PROB == 0) {
-		tdb_delete(db, key);
+		tdb_delete(tdb, key);
 	}
 	return 0;
 }
 
 static void addrec_db(void)
 {
-	int klen, dlen;
-	char *k, *d;
-	TDB_DATA key, data;
+	int klen, dlen, slen;
+	char *k, *d, *s;
+	TDB_DATA key, data, lockkey;
 
 	klen = 1 + (rand() % KEYLEN);
 	dlen = 1 + (rand() % DATALEN);
+	slen = 1 + (rand() % LOCKLEN);
 
 	k = randbuf(klen);
 	d = randbuf(dlen);
+	s = randbuf(slen);
 
 	key.dptr = k;
 	key.dsize = klen+1;
@@ -89,27 +96,65 @@ static void addrec_db(void)
 	data.dptr = d;
 	data.dsize = dlen+1;
 
+	lockkey.dptr = s;
+	lockkey.dsize = slen+1;
+
+#if REOPEN_PROB
+	if (random() % REOPEN_PROB == 0) {
+		tdb_reopen_all();
+		goto next;
+	} 
+#endif
+
+#if DELETE_PROB
 	if (random() % DELETE_PROB == 0) {
 		tdb_delete(db, key);
-	} else if (random() % STORE_PROB == 0) {
+		goto next;
+	}
+#endif
+
+#if STORE_PROB
+	if (random() % STORE_PROB == 0) {
 		if (tdb_store(db, key, data, TDB_REPLACE) != 0) {
 			fatal("tdb_store failed");
 		}
-	} else if (random() % TRAVERSE_PROB == 0) {
-		tdb_traverse(db, cull_traverse, NULL);
-	} else {
+		goto next;
+	}
+#endif
+
+#if LOCKSTORE_PROB
+	if (random() % LOCKSTORE_PROB == 0) {
+		tdb_chainlock(db, lockkey);
 		data = tdb_fetch(db, key);
-		if (data.dptr) free(data.dptr);
+		if (tdb_store(db, key, data, TDB_REPLACE) != 0) {
+			fatal("tdb_store failed");
+		}
+		SAFE_FREE(data.dptr);
+		tdb_chainunlock(db, lockkey);
+		goto next;
+	} 
+#endif
+
+#if TRAVERSE_PROB
+	if (random() % TRAVERSE_PROB == 0) {
+		tdb_traverse(db, cull_traverse, NULL);
+		goto next;
 	}
+#endif
+
+	data = tdb_fetch(db, key);
+	SAFE_FREE(data.dptr);
 
-	free(k);
-	free(d);
+next:
+	SAFE_FREE(k);
+	SAFE_FREE(d);
+	SAFE_FREE(s);
 }
 
-static int traverse_fn(TDB_CONTEXT *db, TDB_DATA key, TDB_DATA dbuf,
+static int traverse_fn(TDB_CONTEXT *tdb, TDB_DATA key, TDB_DATA dbuf,
                        void *state)
 {
-	tdb_delete(db, key);
+	tdb_delete(tdb, key);
 	return 0;
 }
 
@@ -133,7 +178,7 @@ int main(int argc, char *argv[])
 		if ((pids[i+1]=fork()) == 0) break;
 	}
 
-	db = tdb_open("test.tdb", 0, TDB_CLEAR_IF_FIRST, 
+	db = tdb_open("torture.tdb", 2, TDB_CLEAR_IF_FIRST, 
 		      O_RDWR | O_CREAT, 0600);
 	if (!db) {
 		fatal("db open failed");