#include <sys/time.h>
#include <errno.h>
#include <signal.h>
+#include <assert.h>
#define STRINGIFY2(x) #x
#define STRINGIFY(x) STRINGIFY2(x)
/* Avoid mod by zero */
static unsigned int total_keys = 1;
-/* #define DEBUG_DEPS 1 */
+#define DEBUG_DEPS 1
/* Traversals block transactions in the current implementation. */
#define TRAVERSALS_TAKE_TRANSACTION_LOCK 1
union {
int flag; /* open and store */
- struct traverse *trav; /* traverse start */
- TDB_DATA pre_append; /* append */
- unsigned int transaction_end; /* transaction start */
+ struct { /* append */
+ TDB_DATA pre;
+ TDB_DATA post;
+ } append;
+ unsigned int group_len; /* transaction/traverse start */
};
};
static void op_add_append(const char *filename,
struct op op[], unsigned int op_num, char *words[])
{
- TDB_DATA post_append;
-
if (!words[2] || !words[3] || !words[4] || !words[5] || words[6]
|| !streq(words[4], "="))
fail(filename, op_num+1, "Expect <key> <data> = <rec>");
op[op_num].key = make_tdb_data(op, filename, op_num+1, words[2]);
op[op_num].data = make_tdb_data(op, filename, op_num+1, words[3]);
- post_append = make_tdb_data(op, filename, op_num+1, words[5]);
+ op[op_num].append.post
+ = make_tdb_data(op, filename, op_num+1, words[5]);
/* By subtraction, figure out what previous data was. */
- op[op_num].pre_append.dptr = post_append.dptr;
- op[op_num].pre_append.dsize = post_append.dsize - op[op_num].data.dsize;
+ op[op_num].append.pre.dptr = op[op_num].append.post.dptr;
+ op[op_num].append.pre.dsize
+ = op[op_num].append.post.dsize - op[op_num].data.dsize;
total_keys++;
}
fail(filename, op_num+1, "Expect no arguments");
op[op_num].key = tdb_null;
- op[op_num].trav = NULL;
+ op[op_num].group_len = 0;
}
static void op_add_transaction(const char *filename, struct op op[],
fail(filename, op_num+1, "Expect no arguments");
op[op_num].key = tdb_null;
- op[op_num].transaction_end = 0;
+ op[op_num].group_len = 0;
+}
+
+static int op_transaction_start(struct op op[], unsigned int op_num)
+{
+ unsigned int i;
+
+ for (i = op_num-1; i > 0; i--) {
+ if (op[i].op == OP_TDB_TRANSACTION_START && !op[i].group_len)
+ return i;
+ }
+ return 0;
}
static void op_analyze_transaction(const char *filename,
struct op op[], unsigned int op_num,
char *words[])
{
- int i, start;
+ unsigned int start, i;
op[op_num].key = tdb_null;
if (words[2])
fail(filename, op_num+1, "Expect no arguments");
- for (i = op_num-1; i >= 0; i--) {
- if (op[i].op == OP_TDB_TRANSACTION_START &&
- !op[i].transaction_end)
- break;
- }
-
- if (i < 0)
+ start = op_transaction_start(op, op_num);
+ if (!start)
fail(filename, op_num+1, "no transaction start found");
- start = i;
- op[start].transaction_end = op_num;
+ op[start].group_len = op_num - start;
/* This rolls in nested transactions. I think that's right. */
- for (i++; i <= op_num; i++)
+ for (i = start; i <= op_num; i++)
op[i].group_start = start;
}
unsigned int index;
};
-/* A traverse is a hash of keys, each one associated with ops. */
-struct traverse {
- /* How many traversal callouts should I do? */
- unsigned int num;
-
- /* Where is traversal end op? */
- unsigned int end;
-
- /* For trivial traversals. */
- struct traverse_hash *hash;
-};
-
-/* A trivial traversal is one which doesn't terminate early and only
- * plays with its own record. We can reliably replay these even if
- * traverse order changes. */
-static bool is_trivial_traverse(struct op op[], unsigned int end)
-{
-#if 0
- unsigned int i;
- TDB_DATA cur = tdb_null;
-
- if (op[end].ret != 0)
- return false;
-
- for (i = 0; i < end; i++) {
- if (!op[i].key.dptr)
- continue;
- if (op[i].op == OP_TDB_TRAVERSE)
- cur = op[i].key;
- if (!key_eq(cur, op[i].key))
- return false;
- }
- return true;
-#endif
- /* With multiple things happening at once, no traverse is trivial. */
- return false;
-}
-
static void op_analyze_traverse(const char *filename,
struct op op[], unsigned int op_num,
char *words[])
{
int i, start;
- struct traverse *trav = talloc(op, struct traverse);
op[op_num].key = tdb_null;
} else
op[op_num].ret = 0;
- trav->num = 0;
- trav->end = op_num;
for (i = op_num-1; i >= 0; i--) {
- if (op[i].op == OP_TDB_TRAVERSE)
- trav->num++;
if (op[i].op != OP_TDB_TRAVERSE_READ_START
&& op[i].op != OP_TDB_TRAVERSE_START)
continue;
- if (op[i].trav)
+ if (op[i].group_len)
continue;
break;
}
fail(filename, op_num+1, "no traversal start found");
start = i;
- op[start].trav = trav;
+ op[start].group_len = op_num - start;
for (i = start; i <= op_num; i++)
op[i].group_start = start;
-
- if (is_trivial_traverse(op+i, op_num-i)) {
- /* Fill in a plentiful hash table. */
- op[start].trav->hash = talloc_zero_array(op[i].trav,
- struct traverse_hash,
- trav->num * 2);
- for (i = start; i < op_num; i++) {
- unsigned int h;
- if (op[i].op != OP_TDB_TRAVERSE)
- continue;
- h = hash_key(&op[i].key) % (trav->num * 2);
- while (trav->hash[h].index)
- h = (h + 1) % (trav->num * 2);
- trav->hash[h].index = i+1;
- trav->hash[h].key = op[i].key;
- }
- } else
- trav->hash = NULL;
}
/* Keep -Wmissing-declarations happy: */
struct depend {
/* We can have more than one */
- struct list_node list;
- unsigned int file;
- unsigned int op;
+ struct list_node pre_list;
+ struct list_node post_list;
+ unsigned int needs_file;
+ unsigned int needs_opnum;
+ unsigned int satisfies_file;
+ unsigned int satisfies_opnum;
};
-struct depend_xmit {
- unsigned int dst_op;
- unsigned int src_file, src_op;
-};
-
-static void remove_matching_dep(struct list_head *deps,
- unsigned int file, unsigned int op)
-{
- struct depend *dep;
-
- list_for_each(deps, dep, list) {
- if (dep->file == file && dep->op == op) {
- list_del(&dep->list);
- return;
- }
- }
- errx(1, "Failed to find depend on file %u line %u\n", file, op+1);
-}
-
static void check_deps(const char *filename, struct op op[], unsigned int num)
{
#ifdef DEBUG_DEPS
#endif
}
-static void dump_pre(char *filename[], unsigned int file,
- struct op op[], unsigned int i)
+static void dump_pre(char *filename[], struct op *op[],
+ unsigned int file, unsigned int i)
{
struct depend *dep;
- printf("%s:%u still waiting for:\n", filename[file], i+1);
- list_for_each(&op[i].pre, dep, list)
- printf(" %s:%u\n", filename[dep->file], dep->op+1);
- check_deps(filename[file], op, i);
+ printf("%s:%u (%u) still waiting for:\n", filename[file], i+1,
+ op[file][i].serial);
+ list_for_each(&op[file][i].pre, dep, pre_list)
+ printf(" %s:%u (%u)\n",
+ filename[dep->satisfies_file], dep->satisfies_opnum+1,
+ op[dep->satisfies_file][dep->satisfies_opnum].serial);
+ check_deps(filename[file], op[file], i);
}
-static void do_pre(char *filename[], unsigned int file, int pre_fd,
- struct op op[], unsigned int i)
+/* We simply read/write pointers, since we all are children. */
+static void do_pre(struct tdb_context *tdb,
+ char *filename[], struct op *op[],
+ unsigned int file, int pre_fd, unsigned int i)
{
- while (!list_empty(&op[i].pre)) {
- struct depend_xmit dep;
+ while (!list_empty(&op[file][i].pre)) {
+ struct depend *dep;
#if DEBUG_DEPS
printf("%s:%u:waiting for pre\n", filename[file], i+1);
alarm(10);
while (read(pre_fd, &dep, sizeof(dep)) != sizeof(dep)) {
if (errno == EINTR) {
- dump_pre(filename, file, op, i);
+ dump_pre(filename, op, file, i);
exit(1);
} else
errx(1, "Reading from pipe");
#if DEBUG_DEPS
printf("%s:%u:got pre %u from %s:%u\n", filename[file], i+1,
- dep.dst_op+1, filename[dep.src_file], dep.src_op+1);
+ dep->needs_opnum+1, filename[dep->satisfies_file],
+ dep->satisfies_opnum+1);
fflush(stdout);
#endif
/* This could be any op, not just this one. */
- remove_matching_dep(&op[dep.dst_op].pre,
- dep.src_file, dep.src_op);
+ talloc_free(dep);
}
}
-static void do_post(char *filename[], unsigned int file,
- const struct op op[], unsigned int i)
+static void do_post(char *filename[], struct op *op[],
+ unsigned int file, unsigned int i)
{
struct depend *dep;
- list_for_each(&op[i].post, dep, list) {
- struct depend_xmit dx;
-
- dx.src_file = file;
- dx.src_op = i;
- dx.dst_op = dep->op;
+ list_for_each(&op[file][i].post, dep, post_list) {
#if DEBUG_DEPS
printf("%s:%u:sending to file %s:%u\n", filename[file], i+1,
- filename[dep->file], dep->op+1);
+ filename[dep->needs_file], dep->needs_opnum+1);
#endif
- if (write(pipes[dep->file].fd[1], &dx, sizeof(dx))
- != sizeof(dx))
+ if (write(pipes[dep->needs_file].fd[1], &dep, sizeof(dep))
+ != sizeof(dep))
err(1, "%s:%u failed to tell file %s",
- filename[file], i+1, filename[dep->file]);
+ filename[file], i+1, filename[dep->needs_file]);
}
}
static unsigned run_ops(struct tdb_context *tdb,
int pre_fd,
char *filename[],
+ struct op *op[],
unsigned int file,
- struct op op[],
unsigned int start, unsigned int stop);
struct traverse_info {
- struct op *op;
+ struct op **op;
char **filename;
unsigned file;
int pre_fd;
unsigned int i;
};
-/* Trivial case: do whatever they did for this key. */
-static int trivial_traverse(struct tdb_context *tdb,
- TDB_DATA key, TDB_DATA data,
- void *_tinfo)
-{
- struct traverse_info *tinfo = _tinfo;
- struct traverse *trav = tinfo->op[tinfo->start].trav;
- unsigned int h = hash_key(&key) % (trav->num * 2);
-
- while (trav->hash[h].index) {
- if (key_eq(trav->hash[h].key, key)) {
- run_ops(tdb, tinfo->pre_fd, tinfo->filename,
- tinfo->file, tinfo->op, trav->hash[h].index,
- trav->end);
- tinfo->i++;
- return 0;
- }
- h = (h + 1) % (trav->num * 2);
- }
- fail(tinfo->filename[tinfo->file], tinfo->start + 1,
- "unexpected traverse key");
-}
-
/* More complex. Just do whatever's they did at the n'th entry. */
static int nontrivial_traverse(struct tdb_context *tdb,
TDB_DATA key, TDB_DATA data,
void *_tinfo)
{
struct traverse_info *tinfo = _tinfo;
- struct traverse *trav = tinfo->op[tinfo->start].trav;
+ unsigned int trav_len = tinfo->op[tinfo->file][tinfo->start].group_len;
- if (tinfo->i == trav->end) {
+ if (tinfo->i == tinfo->start + trav_len) {
/* This can happen if traverse expects to be empty. */
- if (tinfo->start + 1 == trav->end)
+ if (trav_len == 1)
return 1;
fail(tinfo->filename[tinfo->file], tinfo->start + 1,
"traverse did not terminate");
}
- if (tinfo->op[tinfo->i].op != OP_TDB_TRAVERSE)
+ if (tinfo->op[tinfo->file][tinfo->i].op != OP_TDB_TRAVERSE)
fail(tinfo->filename[tinfo->file], tinfo->start + 1,
"%s:%u:traverse terminated early");
/* Run any normal ops. */
- tinfo->i = run_ops(tdb, tinfo->pre_fd, tinfo->filename, tinfo->file,
- tinfo->op, tinfo->i+1, trav->end);
+ tinfo->i = run_ops(tdb, tinfo->pre_fd, tinfo->filename, tinfo->op,
+ tinfo->file, tinfo->i+1, tinfo->start + trav_len);
- if (tinfo->i == trav->end)
+ if (tinfo->i == tinfo->start + trav_len)
return 1;
return 0;
unsigned int file,
int (*traversefn)(struct tdb_context *,
tdb_traverse_func, void *),
- struct op op[],
+ struct op *op[],
unsigned int start)
{
- struct traverse *trav = op[start].trav;
struct traverse_info tinfo = { op, filename, file, pre_fd,
start, start+1 };
- /* Trivial case. */
- if (trav->hash) {
- int ret = traversefn(tdb, trivial_traverse, &tinfo);
- if (ret != trav->num)
- fail(filename[file], start+1,
- "short traversal %i", ret);
- return trav->end;
- }
-
traversefn(tdb, nontrivial_traverse, &tinfo);
/* Traversing in wrong order can have strange effects: eg. if
* original traverse went A (delete A), B, we might do B
* (delete A). So if we have ops left over, we do it now. */
- while (tinfo.i != trav->end) {
- if (op[tinfo.i].op == OP_TDB_TRAVERSE)
+ while (tinfo.i != start + op[file][start].group_len) {
+ if (op[file][tinfo.i].op == OP_TDB_TRAVERSE)
tinfo.i++;
else
- tinfo.i = run_ops(tdb, pre_fd, filename, file, op,
- tinfo.i, trav->end);
+ tinfo.i = run_ops(tdb, pre_fd, filename, op, file,
+ tinfo.i,
+ start + op[file][start].group_len);
}
- return trav->end;
+ return tinfo.i;
}
static void break_out(int sig)
unsigned run_ops(struct tdb_context *tdb,
int pre_fd,
char *filename[],
+ struct op *op[],
unsigned int file,
- struct op op[], unsigned int start, unsigned int stop)
+ unsigned int start, unsigned int stop)
{
unsigned int i;
struct sigaction sa;
sigaction(SIGALRM, &sa, NULL);
for (i = start; i < stop; i++) {
- do_pre(filename, file, pre_fd, op, i);
+ do_pre(tdb, filename, op, file, pre_fd, i);
- switch (op[i].op) {
+ switch (op[file][i].op) {
case OP_TDB_LOCKALL:
- try(tdb_lockall(tdb), op[i].ret);
+ try(tdb_lockall(tdb), op[file][i].ret);
break;
case OP_TDB_LOCKALL_MARK:
- try(tdb_lockall_mark(tdb), op[i].ret);
+ try(tdb_lockall_mark(tdb), op[file][i].ret);
break;
case OP_TDB_LOCKALL_UNMARK:
- try(tdb_lockall_unmark(tdb), op[i].ret);
+ try(tdb_lockall_unmark(tdb), op[file][i].ret);
break;
case OP_TDB_LOCKALL_NONBLOCK:
- unreliable(tdb_lockall_nonblock(tdb), op[i].ret,
+ unreliable(tdb_lockall_nonblock(tdb), op[file][i].ret,
tdb_lockall(tdb), tdb_unlockall(tdb));
break;
case OP_TDB_UNLOCKALL:
- try(tdb_unlockall(tdb), op[i].ret);
+ try(tdb_unlockall(tdb), op[file][i].ret);
break;
case OP_TDB_LOCKALL_READ:
- try(tdb_lockall_read(tdb), op[i].ret);
+ try(tdb_lockall_read(tdb), op[file][i].ret);
break;
case OP_TDB_LOCKALL_READ_NONBLOCK:
- unreliable(tdb_lockall_read_nonblock(tdb), op[i].ret,
+ unreliable(tdb_lockall_read_nonblock(tdb),
+ op[file][i].ret,
tdb_lockall_read(tdb),
tdb_unlockall_read(tdb));
break;
case OP_TDB_UNLOCKALL_READ:
- try(tdb_unlockall_read(tdb), op[i].ret);
+ try(tdb_unlockall_read(tdb), op[file][i].ret);
break;
case OP_TDB_CHAINLOCK:
- try(tdb_chainlock(tdb, op[i].key), op[i].ret);
+ try(tdb_chainlock(tdb, op[file][i].key),
+ op[file][i].ret);
break;
case OP_TDB_CHAINLOCK_NONBLOCK:
- unreliable(tdb_chainlock_nonblock(tdb, op[i].key),
- op[i].ret,
- tdb_chainlock(tdb, op[i].key),
- tdb_chainunlock(tdb, op[i].key));
+ unreliable(tdb_chainlock_nonblock(tdb, op[file][i].key),
+ op[file][i].ret,
+ tdb_chainlock(tdb, op[file][i].key),
+ tdb_chainunlock(tdb, op[file][i].key));
break;
case OP_TDB_CHAINLOCK_MARK:
- try(tdb_chainlock_mark(tdb, op[i].key), op[i].ret);
+ try(tdb_chainlock_mark(tdb, op[file][i].key),
+ op[file][i].ret);
break;
case OP_TDB_CHAINLOCK_UNMARK:
- try(tdb_chainlock_unmark(tdb, op[i].key), op[i].ret);
+ try(tdb_chainlock_unmark(tdb, op[file][i].key),
+ op[file][i].ret);
break;
case OP_TDB_CHAINUNLOCK:
- try(tdb_chainunlock(tdb, op[i].key), op[i].ret);
+ try(tdb_chainunlock(tdb, op[file][i].key),
+ op[file][i].ret);
break;
case OP_TDB_CHAINLOCK_READ:
- try(tdb_chainlock_read(tdb, op[i].key), op[i].ret);
+ try(tdb_chainlock_read(tdb, op[file][i].key),
+ op[file][i].ret);
break;
case OP_TDB_CHAINUNLOCK_READ:
- try(tdb_chainunlock_read(tdb, op[i].key), op[i].ret);
+ try(tdb_chainunlock_read(tdb, op[file][i].key),
+ op[file][i].ret);
break;
case OP_TDB_PARSE_RECORD:
- try(tdb_parse_record(tdb, op[i].key, get_len, NULL),
- op[i].ret);
+ try(tdb_parse_record(tdb, op[file][i].key, get_len,
+ NULL),
+ op[file][i].ret);
break;
case OP_TDB_EXISTS:
- try(tdb_exists(tdb, op[i].key), op[i].ret);
+ try(tdb_exists(tdb, op[file][i].key), op[file][i].ret);
break;
case OP_TDB_STORE:
- try(tdb_store(tdb, op[i].key, op[i].data, op[i].flag),
- op[i].ret < 0 ? op[i].ret : 0);
+ try(tdb_store(tdb, op[file][i].key, op[file][i].data,
+ op[file][i].flag),
+ op[file][i].ret);
break;
case OP_TDB_APPEND:
- try(tdb_append(tdb, op[i].key, op[i].data),
- op[i].ret < 0 ? op[i].ret : 0);
+ try(tdb_append(tdb, op[file][i].key, op[file][i].data),
+ op[file][i].ret);
break;
case OP_TDB_GET_SEQNUM:
- try(tdb_get_seqnum(tdb), op[i].ret);
+ try(tdb_get_seqnum(tdb), op[file][i].ret);
break;
case OP_TDB_WIPE_ALL:
- try(tdb_wipe_all(tdb), op[i].ret);
+ try(tdb_wipe_all(tdb), op[file][i].ret);
break;
case OP_TDB_TRANSACTION_START:
- try(tdb_transaction_start(tdb), op[i].ret);
+ try(tdb_transaction_start(tdb), op[file][i].ret);
break;
case OP_TDB_TRANSACTION_CANCEL:
- try(tdb_transaction_cancel(tdb), op[i].ret);
+ try(tdb_transaction_cancel(tdb), op[file][i].ret);
break;
case OP_TDB_TRANSACTION_COMMIT:
- try(tdb_transaction_commit(tdb), op[i].ret);
+ try(tdb_transaction_commit(tdb), op[file][i].ret);
break;
case OP_TDB_TRAVERSE_READ_START:
i = op_traverse(tdb, pre_fd, filename, file,
* done our ops. */
return i;
case OP_TDB_TRAVERSE_END:
- fail(filename[file], i+1, "unepxected end traverse");
+ fail(filename[file], i+1, "unexpected end traverse");
/* FIXME: These must be treated like traverse. */
case OP_TDB_FIRSTKEY:
- if (!key_eq(tdb_firstkey(tdb), op[i].data))
+ if (!key_eq(tdb_firstkey(tdb), op[file][i].data))
fail(filename[file], i+1, "bad firstkey");
break;
case OP_TDB_NEXTKEY:
- if (!key_eq(tdb_nextkey(tdb, op[i].key), op[i].data))
+ if (!key_eq(tdb_nextkey(tdb, op[file][i].key),
+ op[file][i].data))
fail(filename[file], i+1, "bad nextkey");
break;
case OP_TDB_FETCH: {
- TDB_DATA f = tdb_fetch(tdb, op[i].key);
- if (!key_eq(f, op[i].data))
+ TDB_DATA f = tdb_fetch(tdb, op[file][i].key);
+ if (!key_eq(f, op[file][i].data))
fail(filename[file], i+1, "bad fetch %u",
f.dsize);
break;
}
case OP_TDB_DELETE:
- try(tdb_delete(tdb, op[i].key), op[i].ret);
+ try(tdb_delete(tdb, op[file][i].key), op[file][i].ret);
break;
}
- do_post(filename, file, op, i);
+ do_post(filename, op, file, i);
}
return i;
}
+/* tdbtorture, in particular, can do a tdb_close with a transaction in
+ * progress. */
+static struct op *maybe_cancel_transaction(const char *filename,
+ struct op *op, unsigned int *num)
+{
+ unsigned int start = op_transaction_start(op, *num);
+
+ if (start) {
+ char *words[] = { "<unknown>", "tdb_close", NULL };
+ add_op(filename, &op, *num, op[start].serial,
+ OP_TDB_TRANSACTION_CANCEL);
+ op_analyze_transaction(filename, op, *num, words);
+ (*num)++;
+ }
+ return op;
+}
+
static struct op *load_tracefile(const char *filename, unsigned int *num,
unsigned int *hashsize,
unsigned int *tdb_flags,
"lines after tdb_close");
*num = i;
talloc_free(lines);
- return op;
+ return maybe_cancel_transaction(filename,
+ op, num);
}
fail(filename, i+1, "Unknown operation '%s'", words[1]);
}
filename, i);
talloc_free(lines);
*num = i - 1;
- return op;
+ return maybe_cancel_transaction(filename, op, num);
}
/* We remember all the keys we've ever seen, and who has them. */
return NULL;
case OP_TDB_APPEND:
- if (op->pre_append.dsize == 0)
+ if (op->append.pre.dsize == 0)
return ¬_exists_or_empty;
- return &op->pre_append;
+ return &op->append.pre;
case OP_TDB_STORE:
if (op->flag == TDB_INSERT) {
}
-enum satisfaction {
- /* This op makes the other one possible. */
- SATISFIES,
- /* This op makes the other one impossible. */
- DISSATISFIES,
- /* This op makes no difference. */
- NO_CHANGE
-};
+static bool is_transaction(const struct op *op)
+{
+ return op->op == OP_TDB_TRANSACTION_START;
+}
-static enum satisfaction satisfies(const struct op *op, const TDB_DATA *need)
+/* What's the data after this op? pre if nothing changed. */
+static const TDB_DATA *gives(const TDB_DATA *key, const TDB_DATA *pre,
+ const struct op *op)
{
- bool deletes, creates;
+ if (is_transaction(op)) {
+ unsigned int i;
+
+ /* Cancelled transactions don't change anything. */
+ if (op[op->group_len].op == OP_TDB_TRANSACTION_CANCEL)
+ return pre;
+ assert(op[op->group_len].op == OP_TDB_TRANSACTION_COMMIT);
+
+ for (i = 1; i < op->group_len; i++) {
+ /* This skips nested transactions, too */
+ if (op[i].op != OP_TDB_TRAVERSE
+ && key_eq(op[i].key, *key))
+ pre = gives(key, pre, &op[i]);
+ }
+ return pre;
+ }
/* Failed ops don't change state of db. */
if (op->ret < 0)
- return NO_CHANGE;
-
- deletes = (op->op == OP_TDB_DELETE || op->op == OP_TDB_WIPE_ALL);
- /* Append/store is creating the record if ret == 0 (1 means replaced) */
- if (op->op == OP_TDB_APPEND || op->op == OP_TDB_STORE)
- creates = (op->ret == 0);
- else
- creates = false;
-
- if (need == &must_not_exist) {
- if (deletes)
- return SATISFIES;
- if (creates)
- return DISSATISFIES;
- return NO_CHANGE;
- }
+ return pre;
- if (need == &must_exist) {
- if (deletes)
- return DISSATISFIES;
- if (creates)
- return SATISFIES;
- return NO_CHANGE;
- }
+ if (op->op == OP_TDB_DELETE || op->op == OP_TDB_WIPE_ALL)
+ return &tdb_null;
- if (need == ¬_exists_or_empty) {
- if (deletes)
- return SATISFIES;
- if (!creates)
- return NO_CHANGE;
- }
+ if (op->op == OP_TDB_APPEND)
+ return &op->append.post;
- /* OK, we need an exact match. */
- if (deletes)
- return DISSATISFIES;
-
- /* An append which results in the wrong data dissatisfies. */
- if (op->op == OP_TDB_APPEND) {
- if (op->pre_append.dsize + op->data.dsize != need->dsize)
- return DISSATISFIES;
- if (memcmp(op->pre_append.dptr, need->dptr,
- op->pre_append.dsize) != 0)
- return DISSATISFIES;
- if (memcmp(op->data.dptr, need->dptr + op->pre_append.dsize,
- op->data.dsize) != 0)
- return DISSATISFIES;
- return SATISFIES;
- } else if (op->op == OP_TDB_STORE) {
- if (key_eq(op->data, *need))
- return SATISFIES;
- return DISSATISFIES;
- }
- return NO_CHANGE;
+ if (op->op == OP_TDB_STORE)
+ return &op->data;
+
+ return pre;
+}
+
+static bool in_transaction(const struct op op[], unsigned int i)
+{
+ return op[i].group_start && is_transaction(&op[op[i].group_start]);
+}
+
+static bool in_traverse(const struct op op[], unsigned int i)
+{
+ return op[i].group_start && !is_transaction(&op[op[i].group_start]);
}
static struct keyinfo *hash_ops(struct op *op[], unsigned int num_ops[],
unsigned int i, j, h;
struct keyinfo *hash;
- /* Gcc nexted function extension. How cool is this? */
- int compare_user_serial(const void *_a, const void *_b)
- {
- const struct key_user *a = _a, *b = _b;
- int ret = op[a->file][a->op_num].serial
- - op[b->file][b->op_num].serial;
-
- /* Serial is not completely reliable. First, fetches don't
- * inc serial, second we don't lock to get seq number.
- * This smooths things a little for simple cases. */
- if (ret == 0) {
- const TDB_DATA *a_needs, *b_needs;
-
- b_needs = needs(&op[b->file][b->op_num]);
- switch (satisfies(&op[a->file][a->op_num], b_needs)) {
- case SATISFIES:
- /* A comes first: it satisfies B. */
- return -1;
- case DISSATISFIES:
- /* A doesn't come first: it messes up B. */
- return 1;
- default:
- break;
- }
-
- a_needs = needs(&op[a->file][a->op_num]);
- switch (satisfies(&op[b->file][b->op_num], a_needs)) {
- case SATISFIES:
- /* B comes first: it satisfies A. */
- return 1;
- case DISSATISFIES:
- /* B doesn't come first: it messes up A. */
- return -1;
- default:
- break;
- }
- }
- return ret;
- }
-
hash = talloc_zero_array(op[0], struct keyinfo, total_keys*2);
for (i = 0; i < num; i++) {
for (j = 1; j < num_ops[i]; j++) {
hash[h].user = talloc_realloc(hash, hash[h].user,
struct key_user,
hash[h].num_users+1);
- hash[h].user[hash[h].num_users].op_num = j;
+
+ /* If it's in a transaction, it's the transaction which
+ * matters from an analysis POV. */
+ if (in_transaction(op[i], j)) {
+ unsigned start = op[i][j].group_start;
+
+ /* Don't include twice. */
+ if (hash[h].num_users
+ && hash[h].user[hash[h].num_users-1].file
+ == i
+ && hash[h].user[hash[h].num_users-1].op_num
+ == start)
+ continue;
+
+ hash[h].user[hash[h].num_users].op_num = start;
+ } else
+ hash[h].user[hash[h].num_users].op_num = j;
hash[h].user[hash[h].num_users].file = i;
hash[h].num_users++;
}
}
- /* Now sort into seqnum order. */
- for (h = 0; h < total_keys * 2; h++)
- qsort(hash[h].user, hash[h].num_users, sizeof(hash[h].user[0]),
- compare_user_serial);
-
return hash;
}
+static bool satisfies(const TDB_DATA *key, const TDB_DATA *data,
+ const struct op *op)
+{
+ const TDB_DATA *need = NULL;
+
+ if (is_transaction(op)) {
+ unsigned int i;
+
+ /* Look through for an op in this transaction which
+ * needs this key. */
+ for (i = 1; i < op->group_len; i++) {
+ if (op[i].op != OP_TDB_TRAVERSE
+ && key_eq(op[i].key, *key)) {
+ need = needs(&op[i]);
+ /* tdb_exists() is special: there might be
+ * something in the transaction with more
+ * specific requirements. Other ops don't have
+ * specific requirements (eg. store or delete),
+ * but they change the value so we can't get
+ * more information from future ops. */
+ if (op[i].op != OP_TDB_EXISTS)
+ break;
+ }
+ }
+ } else
+ need = needs(op);
+
+ /* Don't need anything? Cool. */
+ if (!need)
+ return true;
+
+ /* This should be tdb_null or a real value. */
+ assert(data != &must_exist);
+ assert(data != &must_not_exist);
+ assert(data != ¬_exists_or_empty);
+
+ /* Must not exist? data must not exist. */
+ if (need == &must_not_exist)
+ return data == &tdb_null;
+
+ /* Must exist? */
+ if (need == &must_exist)
+ return data != &tdb_null;
+
+ /* Either noexist or empty. */
+ if (need == ¬_exists_or_empty)
+ return data->dsize == 0;
+
+ /* Needs something specific. */
+ return key_eq(*data, *need);
+}
+
+static void move_to_front(struct key_user res[], unsigned off, unsigned elem)
+{
+ if (elem != off) {
+ struct key_user tmp = res[elem];
+ memmove(res + off + 1, res + off, (elem - off)*sizeof(res[0]));
+ res[off] = tmp;
+ }
+}
+
+static void restore_to_pos(struct key_user res[], unsigned off, unsigned elem)
+{
+ if (elem != off) {
+ struct key_user tmp = res[off];
+ memmove(res + off, res + off + 1, (elem - off)*sizeof(res[0]));
+ res[elem] = tmp;
+ }
+}
+
+static bool sort_deps(char *filename[], struct op *op[],
+ struct key_user res[],
+ unsigned off, unsigned num,
+ const TDB_DATA *key, const TDB_DATA *data,
+ unsigned num_files, unsigned fuzz)
+{
+ unsigned int i, files_done;
+ struct op *this_op;
+ bool done[num_files];
+
+ /* Does this make serial numbers go backwards? Allow a little fuzz. */
+ if (off > 0) {
+ int serial1 = op[res[off-1].file][res[off-1].op_num].serial;
+ int serial2 = op[res[off].file][res[off].op_num].serial;
+
+ if (serial1 - serial2 > (int)fuzz) {
+#if DEBUG_DEPS
+ printf("Serial jump too far (%u -> %u)\n",
+ serial1, serial2);
+#endif
+ return false;
+ }
+ }
+
+ /* One or none left? We're sorted. */
+ if (off + 1 >= num)
+ return true;
+
+ memset(done, 0, sizeof(done));
+
+ /* Since ops within a trace file are ordered, we just need to figure
+ * out which file to try next. Since we don't take into account
+ * inter-key relationships (which exist by virtue of trace file order),
+ * we minimize the chance of harm by trying to keep in serial order. */
+ for (files_done = 0, i = off; i < num && files_done < num_files; i++) {
+ if (done[res[i].file])
+ continue;
+
+ this_op = &op[res[i].file][res[i].op_num];
+
+ /* Is what we have good enough for this op? */
+ if (satisfies(key, data, this_op)) {
+ move_to_front(res, off, i);
+ if (sort_deps(filename, op, res, off+1, num,
+ key, gives(key, data, this_op),
+ num_files, fuzz))
+ return true;
+ restore_to_pos(res, off, i);
+ }
+ done[res[i].file] = true;
+ files_done++;
+ }
+
+ /* No combination worked. */
+ return false;
+}
+
+static void check_dep_sorting(struct key_user user[], unsigned num_users,
+ unsigned num_files)
+{
+#if DEBUG_DEPS
+ unsigned int i;
+ unsigned minima[num_files];
+
+ memset(minima, 0, sizeof(minima));
+ for (i = 0; i < num_users; i++) {
+ assert(minima[user[i].file] < user[i].op_num);
+ minima[user[i].file] = user[i].op_num;
+ }
+#endif
+}
+
+/* All these ops happen on the same key. Which comes first?
+ *
+ * This can happen both because read ops or failed write ops don't
+ * change serial number, and also due to race since we access the
+ * number unlocked (the race can cause less detectable ordering problems,
+ * in which case we'll deadlock and report: fix manually in that case).
+ */
+static void figure_deps(char *filename[], struct op *op[],
+ const TDB_DATA *key, struct key_user user[],
+ unsigned num_users, unsigned num_files)
+{
+ /* We assume database starts empty. */
+ const struct TDB_DATA *data = &tdb_null;
+ unsigned int fuzz;
+
+ /* We prefer to keep strict serial order if possible: it's the
+ * most likely. We get more lax if that fails. */
+ for (fuzz = 0; fuzz < 100; fuzz = (fuzz + 1)*2) {
+ if (sort_deps(filename, op, user, 0, num_users, key, data,
+ num_files, fuzz))
+ break;
+ }
+
+ if (fuzz >= 100)
+ fail(filename[user[0].file], user[0].op_num+1,
+ "Could not resolve inter-dependencies");
+
+ check_dep_sorting(user, num_users, num_files);
+}
+
+static void sort_ops(struct keyinfo hash[], char *filename[], struct op *op[],
+ unsigned int num)
+{
+ unsigned int h;
+
+ /* Gcc nexted function extension. How cool is this? */
+ int compare_serial(const void *_a, const void *_b)
+ {
+ const struct key_user *a = _a, *b = _b;
+
+ /* First, maintain order within any trace file. */
+ if (a->file == b->file)
+ return a->op_num - b->op_num;
+
+ /* Otherwise, arrange by serial order. */
+ return op[a->file][a->op_num].serial
+ - op[b->file][b->op_num].serial;
+ }
+
+ /* Now sort into serial order. */
+ for (h = 0; h < total_keys * 2; h++) {
+ struct key_user *user = hash[h].user;
+
+ qsort(user, hash[h].num_users, sizeof(user[0]), compare_serial);
+ figure_deps(filename, op, &hash[h].key, user, hash[h].num_users,
+ num);
+ }
+}
+
+static int destroy_depend(struct depend *dep)
+{
+ list_del(&dep->pre_list);
+ list_del(&dep->post_list);
+ return 0;
+}
+
static void add_dependency(void *ctx,
struct op *op[],
char *filename[],
unsigned int satisfies_file,
unsigned int satisfies_opnum)
{
- struct depend *post, *pre;
- unsigned int needs_start, sat_start;
+ struct depend *dep;
/* We don't depend on ourselves. */
- if (needs_file == satisfies_file)
+ if (needs_file == satisfies_file) {
+ assert(satisfies_opnum < needs_opnum);
return;
+ }
#if DEBUG_DEPS
printf("%s:%u: depends on %s:%u\n",
filename[satisfies_file], satisfies_opnum+1);
#endif
- needs_start = op[needs_file][needs_opnum].group_start;
- sat_start = op[satisfies_file][satisfies_opnum].group_start;
-
- /* If needs is in a transaction, we need it before start. */
- if (needs_start) {
- switch (op[needs_file][needs_start].op) {
- case OP_TDB_TRANSACTION_START:
- needs_opnum = needs_start;
-#ifdef DEBUG_DEPS
- printf(" -> Back to %u\n", needs_start+1);
- fflush(stdout);
-#endif
- break;
- default:
- break;
- }
+#if TRAVERSALS_TAKE_TRANSACTION_LOCK
+ /* If something in a traverse depends on something in another
+ * traverse/transaction, it creates a dependency between the
+ * two groups. */
+ if ((in_traverse(op[satisfies_file], satisfies_opnum)
+ && op[needs_file][needs_opnum].group_start)
+ || (in_traverse(op[needs_file], needs_opnum)
+ && op[satisfies_file][satisfies_opnum].group_start)) {
+ unsigned int sat;
+
+ /* We are satisfied by end of group. */
+ sat = op[satisfies_file][satisfies_opnum].group_start;
+ satisfies_opnum = sat + op[satisfies_file][sat].group_len;
+ /* And we need that done by start of our group. */
+ needs_opnum = op[needs_file][needs_opnum].group_start;
}
- /* If satisfies is in a transaction, we wait until after commit. */
- /* FIXME: If transaction is cancelled, don't need dependency. */
- if (sat_start) {
- if (op[satisfies_file][sat_start].op
- == OP_TDB_TRANSACTION_START) {
- satisfies_opnum
- = op[satisfies_file][sat_start].transaction_end;
-#ifdef DEBUG_DEPS
- printf(" -> Depends on %u\n", satisfies_opnum+1);
- fflush(stdout);
-#endif
+ /* There is also this case:
+ * <traverse> <read foo> ...
+ * <transaction> ... </transaction> <create foo>
+ * Where if we start the traverse then wait, we could block
+ * the transaction and deadlock.
+ *
+ * We try to address this by ensuring that where seqnum indicates it's
+ * possible, we wait for <create foo> before *starting* traverse.
+ */
+ else if (in_traverse(op[needs_file], needs_opnum)) {
+ struct op *need = &op[needs_file][needs_opnum];
+ if (op[needs_file][need->group_start].serial >
+ op[satisfies_file][satisfies_opnum].serial) {
+ needs_opnum = need->group_start;
}
}
+#endif
- post = talloc(ctx, struct depend);
- post->file = needs_file;
- post->op = needs_opnum;
- list_add(&op[satisfies_file][satisfies_opnum].post, &post->list);
-
- pre = talloc(ctx, struct depend);
- pre->file = satisfies_file;
- pre->op = satisfies_opnum;
- list_add(&op[needs_file][needs_opnum].pre, &pre->list);
+ /* If you depend on a transaction, you actually depend on it ending. */
+ if (is_transaction(&op[satisfies_file][satisfies_opnum])) {
+ satisfies_opnum
+ += op[satisfies_file][satisfies_opnum].group_len;
+#if DEBUG_DEPS
+ printf("-> Actually end of transaction %s:%u\n",
+ filename[satisfies_file], satisfies_opnum+1);
+#endif
+ } else
+ /* We should never create a dependency from middle of
+ * a transaction. */
+ assert(!in_transaction(op[satisfies_file], satisfies_opnum)
+ || op[satisfies_file][satisfies_opnum].op
+ == OP_TDB_TRANSACTION_COMMIT
+ || op[satisfies_file][satisfies_opnum].op
+ == OP_TDB_TRANSACTION_CANCEL);
+
+ assert(op[needs_file][needs_opnum].op != OP_TDB_TRAVERSE);
+ assert(op[satisfies_file][satisfies_opnum].op != OP_TDB_TRAVERSE);
+
+ dep = talloc(ctx, struct depend);
+ dep->needs_file = needs_file;
+ dep->needs_opnum = needs_opnum;
+ dep->satisfies_file = satisfies_file;
+ dep->satisfies_opnum = satisfies_opnum;
+ list_add(&op[satisfies_file][satisfies_opnum].post, &dep->post_list);
+ list_add(&op[needs_file][needs_opnum].pre, &dep->pre_list);
+ talloc_set_destructor(dep, destroy_depend);
}
-#if TRAVERSALS_TAKE_TRANSACTION_LOCK
-struct traverse_dep {
- unsigned int file;
- unsigned int op_num;
- const struct op *op;
-};
+static bool changes_db(const TDB_DATA *key, const struct op *op)
+{
+ return gives(key, NULL, op) != NULL;
+}
-/* Sort by which one runs first. */
-static int compare_traverse_dep(const void *_a, const void *_b)
+static void depend_on_previous(struct op *op[],
+ char *filename[],
+ unsigned int num,
+ struct key_user user[],
+ unsigned int i,
+ int prev)
{
- const struct traverse_dep *a = _a, *b = _b;
- const struct traverse *trava = a->op->trav, *travb = b->op->trav;
+ bool deps[num];
+ int j;
- if (a->op->serial != b->op->serial)
- return a->op->serial - b->op->serial;
+ if (i == 0)
+ return;
+
+ if (prev == i - 1) {
+ /* Just depend on previous. */
+ add_dependency(NULL, op, filename,
+ user[i].file, user[i].op_num,
+ user[prev].file, user[prev].op_num);
+ return;
+ }
- /* If they have same serial, it means one didn't make any changes.
- * Thus sort by end in that case. */
- return a->op[trava->end - a->op_num].serial
- - b->op[travb->end - b->op_num].serial;
+ /* We have to wait for the readers. Find last one in *each* file. */
+ memset(deps, 0, sizeof(deps));
+ deps[user[i].file] = true;
+ for (j = i - 1; j > prev; j--) {
+ if (!deps[user[j].file]) {
+ add_dependency(NULL, op, filename,
+ user[i].file, user[i].op_num,
+ user[j].file, user[j].op_num);
+ deps[user[j].file] = true;
+ }
+ }
}
-/* Traversals can deadlock against each other. Force order. */
-static void make_traverse_depends(char *filename[],
- struct op *op[], unsigned int num_ops[],
+/* This is simple, but not complete. We don't take into account
+ * indirect dependencies. */
+static void optimize_dependencies(struct op *op[], unsigned int num_ops[],
unsigned int num)
{
- unsigned int i, j, num_traversals = 0;
- struct traverse_dep *dep;
-
- dep = talloc_array(NULL, struct traverse_dep, 1);
+ unsigned int i, j;
- /* Count them. */
+ /* There can only be one real dependency on each file */
for (i = 0; i < num; i++) {
- for (j = 0; j < num_ops[i]; j++) {
- if (op[i][j].op == OP_TDB_TRAVERSE_START
- || op[i][j].op == OP_TDB_TRAVERSE_READ_START) {
- dep = talloc_realloc(NULL, dep,
- struct traverse_dep,
- num_traversals+1);
- dep[num_traversals].file = i;
- dep[num_traversals].op_num = j;
- dep[num_traversals].op = &op[i][j];
- num_traversals++;
+ for (j = 1; j < num_ops[i]; j++) {
+ struct depend *dep, *next;
+ struct depend *prev[num];
+
+ memset(prev, 0, sizeof(prev));
+
+ list_for_each_safe(&op[i][j].pre, dep, next, pre_list) {
+ if (!prev[dep->satisfies_file]) {
+ prev[dep->satisfies_file] = dep;
+ continue;
+ }
+ if (prev[dep->satisfies_file]->satisfies_opnum
+ < dep->satisfies_opnum) {
+ talloc_free(prev[dep->satisfies_file]);
+ prev[dep->satisfies_file] = dep;
+ } else
+ talloc_free(dep);
}
}
}
- qsort(dep, num_traversals, sizeof(dep[0]), compare_traverse_dep);
- for (i = 1; i < num_traversals; i++) {
- /* i depends on end of traverse i-1. */
- add_dependency(NULL, op, filename, dep[i].file, dep[i].op_num,
- dep[i-1].file, dep[i-1].op->trav->end);
+
+ for (i = 0; i < num; i++) {
+ int deps[num];
+
+ for (j = 0; j < num; j++)
+ deps[j] = -1;
+
+ for (j = 1; j < num_ops[i]; j++) {
+ struct depend *dep, *next;
+
+ list_for_each_safe(&op[i][j].pre, dep, next, pre_list) {
+ if (deps[dep->satisfies_file]
+ >= (int)dep->satisfies_opnum)
+ talloc_free(dep);
+ else
+ deps[dep->satisfies_file]
+ = dep->satisfies_opnum;
+ }
+ }
}
- talloc_free(dep);
}
-#endif /* TRAVERSALS_TAKE_TRANSACTION_LOCK */
static void derive_dependencies(char *filename[],
struct op *op[], unsigned int num_ops[],
unsigned int num)
{
struct keyinfo *hash;
- unsigned int i, j;
+ unsigned int h, i;
/* Create hash table for faster key lookup. */
hash = hash_ops(op, num_ops, num);
- /* We make the naive assumption that two ops on the same key
- * have to be ordered; it's overkill. */
- for (i = 0; i < total_keys * 2; i++) {
- for (j = 1; j < hash[i].num_users; j++) {
- add_dependency(hash, op, filename,
- hash[i].user[j].file,
- hash[i].user[j].op_num,
- hash[i].user[j-1].file,
- hash[i].user[j-1].op_num);
+ /* Sort them by serial number. */
+ sort_ops(hash, filename, op, num);
+
+ /* Create dependencies back to the last change, rather than
+ * creating false dependencies by naively making each one
+ * depend on the previous. This has two purposes: it makes
+ * later optimization simpler, and it also avoids deadlock with
+ * same sequence number ops inside traversals (if one
+ * traversal doesn't write anything, two ops can have the same
+ * sequence number yet we can create a traversal dependency
+ * the other way). */
+ for (h = 0; h < total_keys * 2; h++) {
+ int prev = -1;
+
+ if (hash[h].num_users < 2)
+ continue;
+
+ for (i = 0; i < hash[h].num_users; i++) {
+ if (changes_db(&hash[h].key, &op[hash[h].user[i].file]
+ [hash[h].user[i].op_num])) {
+ depend_on_previous(op, filename, num,
+ hash[h].user, i, prev);
+ prev = i;
+ } else if (prev >= 0)
+ add_dependency(hash, op, filename,
+ hash[h].user[i].file,
+ hash[h].user[i].op_num,
+ hash[h].user[prev].file,
+ hash[h].user[prev].op_num);
}
}
-#if TRAVERSALS_TAKE_TRANSACTION_LOCK
- make_traverse_depends(filename, op, num_ops, num);
-#endif
+ optimize_dependencies(op, num_ops, num);
}
int main(int argc, char *argv[])
printf("Single threaded run...");
fflush(stdout);
- run_ops(tdb, pipes[0].fd[0], argv+2, 0, op[0], 1, num_ops[0]);
+ run_ops(tdb, pipes[0].fd[0], argv+2, op, 0, 1, num_ops[0]);
check_deps(argv[2], op[0], num_ops[0]);
printf("done\n");
/* This catches parent exiting. */
if (read(fds[0], &c, 1) != 1)
exit(1);
- run_ops(tdb, pipes[i].fd[0], argv+2, i, op[i], 1,
+ run_ops(tdb, pipes[i].fd[0], argv+2, op, i, 1,
num_ops[i]);
check_deps(argv[2+i], op[i], num_ops[i]);
exit(0);
projects / ccan / blobdiff