static union tdb_attribute seed_attr;
static void tdb_log(struct tdb_context *tdb, enum tdb_log_level level,
- void *private, const char *message)
+ const char *message, void *data)
{
fputs(message, stdout);
fflush(stdout);
#if 0
{
- char *ptr;
+ char str[200];
signal(SIGUSR1, SIG_IGN);
- asprintf(&ptr,"xterm -e gdb /proc/%d/exe %d", getpid(), getpid());
- system(ptr);
- free(ptr);
+ sprintf(str,"xterm -e gdb /proc/%d/exe %d", getpid(), getpid());
+ system(str);
}
#endif
}
#include "../private.h"
-static void segv_handler(int signal, siginfo_t *info, void *p)
+static void segv_handler(int sig, siginfo_t *info, void *p)
{
char string[100];
- sprintf(string, "%u: death at %p (map_ptr %p, map_size %llu)\n",
- getpid(), info->si_addr, db->map_ptr, db->map_size);
- write(2, string, strlen(string));
- sleep(60);
+ sprintf(string, "%u: death at %p (map_ptr %p, map_size %zu)\n",
+ getpid(), info->si_addr, db->file->map_ptr,
+ (size_t)db->file->map_size);
+ if (write(2, string, strlen(string)) > 0)
+ sleep(60);
_exit(11);
}
-static void fatal(const char *why)
+static void fatal(struct tdb_context *tdb, const char *why)
{
- perror(why);
+ fprintf(stderr, "%u:%s:%s\n", getpid(), why,
+ tdb ? tdb_errorstr(tdb_error(tdb)) : "(no tdb)");
error_count++;
}
#if TRANSACTION_PROB
if (in_traverse == 0 && in_transaction == 0 && (always_transaction || random() % TRANSACTION_PROB == 0)) {
if (tdb_transaction_start(db) != 0) {
- fatal("tdb_transaction_start failed");
+ fatal(db, "tdb_transaction_start failed");
}
in_transaction++;
goto next;
if (in_traverse == 0 && in_transaction && random() % TRANSACTION_PROB == 0) {
if (random() % TRANSACTION_PREPARE_PROB == 0) {
if (tdb_transaction_prepare_commit(db) != 0) {
- fatal("tdb_transaction_prepare_commit failed");
+ fatal(db, "tdb_transaction_prepare_commit failed");
}
}
if (tdb_transaction_commit(db) != 0) {
- fatal("tdb_transaction_commit failed");
+ fatal(db, "tdb_transaction_commit failed");
}
in_transaction--;
goto next;
#if STORE_PROB
if (random() % STORE_PROB == 0) {
if (tdb_store(db, key, data, TDB_REPLACE) != 0) {
- fatal("tdb_store failed");
+ fatal(db, "tdb_store failed");
}
goto next;
}
#if APPEND_PROB
if (random() % APPEND_PROB == 0) {
if (tdb_append(db, key, data) != 0) {
- fatal("tdb_append failed");
+ fatal(db, "tdb_append failed");
}
goto next;
}
#if LOCKSTORE_PROB
if (random() % LOCKSTORE_PROB == 0) {
tdb_chainlock(db, key);
- tdb_fetch(db, key, &data);
+ if (tdb_fetch(db, key, &data) != TDB_SUCCESS) {
+ data.dsize = 0;
+ data.dptr = NULL;
+ }
if (tdb_store(db, key, data, TDB_REPLACE) != 0) {
- fatal("tdb_store failed");
+ fatal(db, "tdb_store failed");
}
if (data.dptr) free(data.dptr);
tdb_chainunlock(db, key);
#if TRANSACTION_PROB
" [-t]"
#endif
- " [-k] [-n NUM_PROCS] [-l NUM_LOOPS] [-s SEED]\n");
+ " [-k] [-n NUM_PROCS] [-l NUM_LOOPS] [-s SEED] [-S]\n");
exit(0);
}
static void send_count_and_suicide(int sig)
{
/* This ensures our successor can continue where we left off. */
- write(count_pipe, &loopnum, sizeof(loopnum));
+ if (write(count_pipe, &loopnum, sizeof(loopnum)) != sizeof(loopnum))
+ exit(2);
/* This gives a unique signature. */
kill(getpid(), SIGUSR2);
}
-static int run_child(int i, int seed, unsigned num_loops, unsigned start)
+static int run_child(int i, int seed, unsigned num_loops, unsigned start,
+ int tdb_flags)
{
struct sigaction act = { .sa_sigaction = segv_handler,
.sa_flags = SA_SIGINFO };
sigaction(11, &act, NULL);
- db = tdb_open("torture.tdb", TDB_DEFAULT, O_RDWR | O_CREAT, 0600,
+ db = tdb_open("torture.tdb", tdb_flags, O_RDWR | O_CREAT, 0600,
&log_attr);
if (!db) {
- fatal("db open failed");
+ fatal(NULL, "db open failed");
}
#if 0
in_transaction--;
}
if (tdb_transaction_start(db) != 0)
- fatal("tdb_transaction_start failed");
+ fatal(db, "tdb_transaction_start failed");
}
#endif
tdb_traverse(db, traverse_fn, NULL);
#if TRANSACTION_PROB
if (always_transaction) {
if (tdb_transaction_commit(db) != 0)
- fatal("tdb_transaction_commit failed");
+ fatal(db, "tdb_transaction_commit failed");
}
#endif
}
pid_t *pids;
int kill_random = 0;
int *done;
+ int tdb_flags = TDB_DEFAULT;
log_attr.base.attr = TDB_ATTRIBUTE_LOG;
log_attr.base.next = &seed_attr;
- log_attr.log.log_fn = tdb_log;
+ log_attr.log.fn = tdb_log;
seed_attr.base.attr = TDB_ATTRIBUTE_SEED;
- while ((c = getopt(argc, argv, "n:l:s:thk")) != -1) {
+ while ((c = getopt(argc, argv, "n:l:s:thkS")) != -1) {
switch (c) {
case 'n':
num_procs = strtol(optarg, NULL, 0);
case 's':
seed = strtol(optarg, NULL, 0);
break;
+ case 'S':
+ tdb_flags = TDB_NOSYNC;
+ break;
case 't':
#if TRANSACTION_PROB
always_transaction = 1;
if (num_procs == 1 && !kill_random) {
/* Don't fork for this case, makes debugging easier. */
- error_count = run_child(0, seed, num_loops, 0);
+ error_count = run_child(0, seed, num_loops, 0, tdb_flags);
goto done;
}
#endif
);
}
- exit(run_child(i, seed, num_loops, 0));
+ exit(run_child(i, seed, num_loops, 0, tdb_flags));
}
}
|| WTERMSIG(status) == SIGUSR1) {
/* SIGUSR2 means they wrote to pipe. */
if (WTERMSIG(status) == SIGUSR2) {
- read(pfds[0], &done[j],
- sizeof(done[j]));
+ if (read(pfds[0], &done[j],
+ sizeof(done[j]))
+ != sizeof(done[j]))
+ err(1,
+ "Short read from child?");
}
pids[j] = fork();
if (pids[j] == 0)
exit(run_child(j, seed, num_loops,
- done[j]));
+ done[j], tdb_flags));
printf("Restarting child %i for %u-%u\n",
j, done[j], num_loops);
continue;
db = tdb_open("torture.tdb", TDB_DEFAULT, O_RDWR | O_CREAT,
0600, &log_attr);
if (!db) {
- fatal("db open failed");
+ fatal(db, "db open failed");
+ exit(1);
}
- if (tdb_check(db, NULL, NULL) == -1) {
- printf("db check failed");
+ if (tdb_check(db, NULL, NULL) != 0) {
+ fatal(db, "db check failed");
exit(1);
}
tdb_close(db);
projects / ccan / blobdiff