Better tdb tracing, start of decent replay_trace.
authorRusty Russell <rusty@rustcorp.com.au>
Tue, 7 Jul 2009 11:04:44 +0000 (20:34 +0930)
committerRusty Russell <rusty@rustcorp.com.au>
Tue, 7 Jul 2009 11:04:44 +0000 (20:34 +0930)
12 files changed:
ccan/tdb/lock.c
ccan/tdb/open.c
ccan/tdb/tdb.c
ccan/tdb/tdb_private.h
ccan/tdb/tools/Makefile
ccan/tdb/tools/keywords.c [new file with mode: 0644]
ccan/tdb/tools/keywords.gperf [new file with mode: 0644]
ccan/tdb/tools/replay_trace.c
ccan/tdb/tools/tdbdump.c [new file with mode: 0644]
ccan/tdb/tools/tdbtorture.c
ccan/tdb/transaction.c
ccan/tdb/traverse.c

index 2bb6ddb88385a56de4ca48d57ea4c5f07eb6317f..473a9bf52c3b0b855d892cf1c1b611dede6c3547 100644 (file)
@@ -413,21 +413,21 @@ static int _tdb_unlockall(struct tdb_context *tdb, int ltype)
 /* lock entire database with write lock */
 int tdb_lockall(struct tdb_context *tdb)
 {
-       tdb_trace(tdb, "tdb_lockall\n");
+       tdb_trace(tdb, "tdb_lockall");
        return _tdb_lockall(tdb, F_WRLCK, F_SETLKW);
 }
 
 /* lock entire database with write lock - mark only */
 int tdb_lockall_mark(struct tdb_context *tdb)
 {
-       tdb_trace(tdb, "tdb_lockall_mark\n");
+       tdb_trace(tdb, "tdb_lockall_mark");
        return _tdb_lockall(tdb, F_WRLCK | TDB_MARK_LOCK, F_SETLKW);
 }
 
 /* unlock entire database with write lock - unmark only */
 int tdb_lockall_unmark(struct tdb_context *tdb)
 {
-       tdb_trace(tdb, "tdb_lockall_unmark\n");
+       tdb_trace(tdb, "tdb_lockall_unmark");
        return _tdb_unlockall(tdb, F_WRLCK | TDB_MARK_LOCK);
 }
 
@@ -435,21 +435,21 @@ int tdb_lockall_unmark(struct tdb_context *tdb)
 int tdb_lockall_nonblock(struct tdb_context *tdb)
 {
        int ret = _tdb_lockall(tdb, F_WRLCK, F_SETLK);
-       tdb_trace(tdb, "tdb_lockall_nonblock = %i\n", ret);
+       tdb_trace_ret(tdb, "tdb_lockall_nonblock", ret);
        return ret;
 }
 
 /* unlock entire database with write lock */
 int tdb_unlockall(struct tdb_context *tdb)
 {
-       tdb_trace(tdb, "tdb_unlockall\n");
+       tdb_trace(tdb, "tdb_unlockall");
        return _tdb_unlockall(tdb, F_WRLCK);
 }
 
 /* lock entire database with read lock */
 int tdb_lockall_read(struct tdb_context *tdb)
 {
-       tdb_trace(tdb, "tdb_lockall_read\n");
+       tdb_trace(tdb, "tdb_lockall_read");
        return _tdb_lockall(tdb, F_RDLCK, F_SETLKW);
 }
 
@@ -457,14 +457,14 @@ int tdb_lockall_read(struct tdb_context *tdb)
 int tdb_lockall_read_nonblock(struct tdb_context *tdb)
 {
        int ret = _tdb_lockall(tdb, F_RDLCK, F_SETLK);
-       tdb_trace(tdb, "tdb_lockall_read_nonblock = %i\n", ret);
+       tdb_trace_ret(tdb, "tdb_lockall_read_nonblock", ret);
        return ret;
 }
 
 /* unlock entire database with read lock */
 int tdb_unlockall_read(struct tdb_context *tdb)
 {
-       tdb_trace(tdb, "tdb_unlockall_read\n");
+       tdb_trace(tdb, "tdb_unlockall_read");
        return _tdb_unlockall(tdb, F_RDLCK);
 }
 
@@ -472,10 +472,9 @@ int tdb_unlockall_read(struct tdb_context *tdb)
    contention - it cannot guarantee how many records will be locked */
 int tdb_chainlock(struct tdb_context *tdb, TDB_DATA key)
 {
-       tdb_trace(tdb, "tdb_chainlock ");
-       tdb_trace_record(tdb, key);
-       tdb_trace(tdb, "\n");
-       return tdb_lock(tdb, BUCKET(tdb->hash_fn(&key)), F_WRLCK);
+       int ret = tdb_lock(tdb, BUCKET(tdb->hash_fn(&key)), F_WRLCK);
+       tdb_trace_1rec(tdb, "tdb_chainlock", key);
+       return ret;
 }
 
 /* lock/unlock one hash chain, non-blocking. This is meant to be used
@@ -484,56 +483,45 @@ int tdb_chainlock(struct tdb_context *tdb, TDB_DATA key)
 int tdb_chainlock_nonblock(struct tdb_context *tdb, TDB_DATA key)
 {
        int ret = tdb_lock_nonblock(tdb, BUCKET(tdb->hash_fn(&key)), F_WRLCK);
-       tdb_trace(tdb, "tdb_chainlock_nonblock ");
-       tdb_trace_record(tdb, key);
-       tdb_trace(tdb, "= %i\n", ret);
+       tdb_trace_1rec_ret(tdb, "tdb_chainlock_nonblock", key, ret);
        return ret;
 }
 
 /* mark a chain as locked without actually locking it. Warning! use with great caution! */
 int tdb_chainlock_mark(struct tdb_context *tdb, TDB_DATA key)
 {
-       tdb_trace(tdb, "tdb_chainlock_mark ");
-       tdb_trace_record(tdb, key);
-       tdb_trace(tdb, "\n");
-       return tdb_lock(tdb, BUCKET(tdb->hash_fn(&key)), F_WRLCK | TDB_MARK_LOCK);
+       int ret = tdb_lock(tdb, BUCKET(tdb->hash_fn(&key)), F_WRLCK | TDB_MARK_LOCK);
+       tdb_trace_1rec(tdb, "tdb_chainlock_mark", key);
+       return ret;
 }
 
 /* unmark a chain as locked without actually locking it. Warning! use with great caution! */
 int tdb_chainlock_unmark(struct tdb_context *tdb, TDB_DATA key)
 {
-       tdb_trace(tdb, "tdb_chainlock_unmark ");
-       tdb_trace_record(tdb, key);
-       tdb_trace(tdb, "\n");
+       tdb_trace_1rec(tdb, "tdb_chainlock_unmark", key);
        return tdb_unlock(tdb, BUCKET(tdb->hash_fn(&key)), F_WRLCK | TDB_MARK_LOCK);
 }
 
 int tdb_chainunlock(struct tdb_context *tdb, TDB_DATA key)
 {
-       tdb_trace(tdb, "tdb_chainunlock ");
-       tdb_trace_record(tdb, key);
-       tdb_trace(tdb, "\n");
+       tdb_trace_1rec(tdb, "tdb_chainlock", key);
        return tdb_unlock(tdb, BUCKET(tdb->hash_fn(&key)), F_WRLCK);
 }
 
 int tdb_chainlock_read(struct tdb_context *tdb, TDB_DATA key)
 {
-       tdb_trace(tdb, "tdb_chainlock_read ");
-       tdb_trace_record(tdb, key);
-       tdb_trace(tdb, "\n");
-       return tdb_lock(tdb, BUCKET(tdb->hash_fn(&key)), F_RDLCK);
+       int ret;
+       ret = tdb_lock(tdb, BUCKET(tdb->hash_fn(&key)), F_RDLCK);
+       tdb_trace_1rec(tdb, "tdb_chainlock_read", key);
+       return ret;
 }
 
 int tdb_chainunlock_read(struct tdb_context *tdb, TDB_DATA key)
 {
-       tdb_trace(tdb, "tdb_chainunlock_read ");
-       tdb_trace_record(tdb, key);
-       tdb_trace(tdb, "\n");
+       tdb_trace_1rec(tdb, "tdb_chainunlock_read", key);
        return tdb_unlock(tdb, BUCKET(tdb->hash_fn(&key)), F_RDLCK);
 }
 
-
-
 /* record lock stops delete underneath */
 int tdb_lock_record(struct tdb_context *tdb, tdb_off_t off)
 {
index e58d381f7ce85fc675f9d6eb7cd48e8ba51a5e2e..4a1cb235e271228564038c6173b1056b21573be1 100644 (file)
@@ -163,19 +163,6 @@ struct tdb_context *tdb_open_ex(const char *name, int hash_size, int tdb_flags,
                goto fail;
        }
 
-#ifdef TDB_TRACE
-       if (!(tdb_flags & TDB_INTERNAL)) {
-               sprintf(tracefile, "%s.trace.%u", name, getpid());
-               tdb->tracefd = open(tracefile, O_WRONLY|O_CREAT|O_EXCL, 0600);
-               if (tdb->tracefd < 0)
-                       goto fail;
-               tdb_trace(tdb, "tdb_open %s %u %#x %#x %p\n",
-                         name, hash_size, tdb_flags, open_flags, hash_fn);
-       } else
-               /* All writes will fail.  That's OK. */
-               tdb->tracefd = -1;
-#endif
-
        tdb_io_init(tdb);
        tdb->fd = -1;
        tdb->name = NULL;
@@ -222,6 +209,10 @@ struct tdb_context *tdb_open_ex(const char *name, int hash_size, int tdb_flags,
                        TDB_LOG((tdb, TDB_DEBUG_ERROR, "tdb_open_ex: tdb_new_database failed!"));
                        goto fail;
                }
+#ifdef TDB_TRACE
+               /* All tracing will fail.  That's ok. */
+               tdb->tracefd = -1;
+#endif
                goto internal;
        }
 
@@ -330,6 +321,15 @@ struct tdb_context *tdb_open_ex(const char *name, int hash_size, int tdb_flags,
                goto fail;
        }
 
+#ifdef TDB_TRACE
+       sprintf(tracefile, "%s.trace.%u", name, getpid());
+       tdb->tracefd = open(tracefile, O_WRONLY|O_CREAT|O_EXCL, 0600);
+       if (tdb->tracefd < 0)
+               goto fail;
+       tdb_enable_seqnum(tdb);
+       tdb_trace_open(tdb, "tdb_open", hash_size, tdb_flags, open_flags);
+#endif
+
  internal:
        /* Internal (memory-only) databases skip all the code above to
         * do with disk files, and resume here by releasing their
@@ -383,7 +383,7 @@ int tdb_close(struct tdb_context *tdb)
        struct tdb_context **i;
        int ret = 0;
 
-       tdb_trace(tdb, "tdb_close\n");
+       tdb_trace(tdb, "tdb_close");
        if (tdb->transaction) {
                tdb_transaction_cancel_internal(tdb);
        }
index db5e5b49e4b663eeb290401d7346342d870b6a28..50ff24a6e6ca4a44ca84a9b97c7ae3b37d440474 100644 (file)
@@ -155,7 +155,7 @@ static int tdb_update_hash(struct tdb_context *tdb, TDB_DATA key, uint32_t hash,
  * then the TDB_DATA will have zero length but
  * a non-zero pointer
  */
-TDB_DATA tdb_fetch(struct tdb_context *tdb, TDB_DATA key)
+static TDB_DATA do_tdb_fetch(struct tdb_context *tdb, TDB_DATA key)
 {
        tdb_off_t rec_ptr;
        struct list_struct rec;
@@ -165,20 +165,20 @@ TDB_DATA tdb_fetch(struct tdb_context *tdb, TDB_DATA key)
        /* find which hash bucket it is in */
        hash = tdb->hash_fn(&key);
        if (!(rec_ptr = tdb_find_lock_hash(tdb,key,hash,F_RDLCK,&rec))) {
-               tdb_trace(tdb, "tdb_fetch ");
-               tdb_trace_record(tdb, key);
-               tdb_trace(tdb, "= ENOENT\n");
                return tdb_null;
        }
        ret.dptr = tdb_alloc_read(tdb, rec_ptr + sizeof(rec) + rec.key_len,
                                  rec.data_len);
        ret.dsize = rec.data_len;
        tdb_unlock(tdb, BUCKET(rec.full_hash), F_RDLCK);
-       tdb_trace(tdb, "tdb_fetch ");
-       tdb_trace_record(tdb, key);
-       tdb_trace(tdb, "= ");
-       tdb_trace_record(tdb, ret);
-       tdb_trace(tdb, "\n"); 
+       return ret;
+}
+
+TDB_DATA tdb_fetch(struct tdb_context *tdb, TDB_DATA key)
+{
+       TDB_DATA ret = do_tdb_fetch(tdb, key);
+
+       tdb_trace_1rec_retrec(tdb, "tdb_fetch", key, ret);
        return ret;
 }
 
@@ -212,15 +212,11 @@ int tdb_parse_record(struct tdb_context *tdb, TDB_DATA key,
        hash = tdb->hash_fn(&key);
 
        if (!(rec_ptr = tdb_find_lock_hash(tdb,key,hash,F_RDLCK,&rec))) {
-               tdb_trace(tdb, "tdb_parse_record ");
-               tdb_trace_record(tdb, key);
-               tdb_trace(tdb, "= ENOENT\n"); 
+               tdb_trace_1rec_ret(tdb, "tdb_parse_record", key,
+                                  -TDB_ERR_NOEXIST);
                return TDB_ERRCODE(TDB_ERR_NOEXIST, 0);
        }
-
-       tdb_trace(tdb, "tdb_parse_record ");
-       tdb_trace_record(tdb, key);
-       tdb_trace(tdb, "= %u\n", rec.data_len); 
+       tdb_trace_1rec_ret(tdb, "tdb_parse_record", key, 0);
 
        ret = tdb_parse_data(tdb, key, rec_ptr + sizeof(rec) + rec.key_len,
                             rec.data_len, parser, private_data);
@@ -252,9 +248,7 @@ int tdb_exists(struct tdb_context *tdb, TDB_DATA key)
        int ret;
 
        ret = tdb_exists_hash(tdb, key, hash);
-       tdb_trace(tdb, "tdb_exists ");
-       tdb_trace_record(tdb, key);
-       tdb_trace(tdb, "= %i\n", ret); 
+       tdb_trace_1rec_ret(tdb, "tdb_exists", key, ret);
        return ret;
 }
 
@@ -413,9 +407,7 @@ int tdb_delete(struct tdb_context *tdb, TDB_DATA key)
        int ret;
 
        ret = tdb_delete_hash(tdb, key, hash);
-       tdb_trace(tdb, "tdb_delete ");
-       tdb_trace_record(tdb, key);
-       tdb_trace(tdb, "= %s\n", ret ? "ENOENT" : "0"); 
+       tdb_trace_1rec_ret(tdb, "tdb_delete", key, ret);
        return ret;
 }
 
@@ -448,52 +440,29 @@ static tdb_off_t tdb_find_dead(struct tdb_context *tdb, uint32_t hash,
        return 0;
 }
 
-/* store an element in the database, replacing any existing element
-   with the same key 
-
-   return 0 on success, -1 on failure
-*/
-int tdb_store(struct tdb_context *tdb, TDB_DATA key, TDB_DATA dbuf, int flag)
+static int _tdb_store(struct tdb_context *tdb, TDB_DATA key, TDB_DATA dbuf,
+                     int flag, uint32_t hash)
 {
        struct list_struct rec;
-       uint32_t hash;
        tdb_off_t rec_ptr;
        char *p = NULL;
        int ret = -1;
 
-       if (tdb->read_only || tdb->traverse_read) {
-               tdb->ecode = TDB_ERR_RDONLY;
-               return -1;
-       }
-
-       /* find which hash bucket it is in */
-       hash = tdb->hash_fn(&key);
-       if (tdb_lock(tdb, BUCKET(hash), F_WRLCK) == -1)
-               return -1;
-
-       tdb_trace(tdb, "tdb_store %s ", flag == TDB_INSERT ? "insert" :
-                 flag == TDB_MODIFY ? "modify" : "normal");
-       tdb_trace_record(tdb, key);
-       tdb_trace_record(tdb, dbuf);
-
        /* check for it existing, on insert. */
        if (flag == TDB_INSERT) {
                if (tdb_exists_hash(tdb, key, hash)) {
                        tdb->ecode = TDB_ERR_EXISTS;
-                       tdb_trace(tdb, "= EEXIST\n"); 
                        goto fail;
                }
        } else {
                /* first try in-place update, on modify or replace. */
                if (tdb_update_hash(tdb, key, hash, dbuf) == 0) {
-                       tdb_trace(tdb, "= inplace\n"); 
                        goto done;
                }
                if (tdb->ecode == TDB_ERR_NOEXIST &&
                    flag == TDB_MODIFY) {
                        /* if the record doesn't exist and we are in TDB_MODIFY mode then
                         we should fail the store */
-                       tdb_trace(tdb, "= ENOENT\n"); 
                        goto fail;
                }
        }
@@ -541,7 +510,6 @@ int tdb_store(struct tdb_context *tdb, TDB_DATA key, TDB_DATA dbuf, int flag)
                                goto fail;
                        }
                        goto done;
-                       tdb_trace(tdb, "= fromdead\n"); 
                }
        }
 
@@ -579,8 +547,6 @@ int tdb_store(struct tdb_context *tdb, TDB_DATA key, TDB_DATA dbuf, int flag)
        rec.full_hash = hash;
        rec.magic = TDB_MAGIC;
 
-       tdb_trace(tdb, "= allocate\n"); 
-
        /* write out and point the top of the hash chain at it */
        if (tdb_rec_write(tdb, rec_ptr, &rec) == -1
            || tdb->methods->tdb_write(tdb, rec_ptr+sizeof(rec), p, key.dsize+dbuf.dsize)==-1
@@ -597,6 +563,33 @@ int tdb_store(struct tdb_context *tdb, TDB_DATA key, TDB_DATA dbuf, int flag)
        }
 
        SAFE_FREE(p); 
+       return ret;
+}
+
+/* store an element in the database, replacing any existing element
+   with the same key 
+
+   return 0 on success, -1 on failure
+*/
+int tdb_store(struct tdb_context *tdb, TDB_DATA key, TDB_DATA dbuf, int flag)
+{
+       uint32_t hash;
+       int ret;
+
+       if (tdb->read_only || tdb->traverse_read) {
+               tdb->ecode = TDB_ERR_RDONLY;
+               tdb_trace_2rec_flag_ret(tdb, "tdb_store", key, dbuf, flag,
+                                       -TDB_ERR_RDONLY);
+               return -1;
+       }
+
+       /* find which hash bucket it is in */
+       hash = tdb->hash_fn(&key);
+       if (tdb_lock(tdb, BUCKET(hash), F_WRLCK) == -1)
+               return -1;
+
+       ret = _tdb_store(tdb, key, dbuf, flag, hash);
+       tdb_trace_2rec_flag_ret(tdb, "tdb_store", key, dbuf, flag, ret);
        tdb_unlock(tdb, BUCKET(hash), F_WRLCK);
        return ret;
 }
@@ -614,11 +607,7 @@ int tdb_append(struct tdb_context *tdb, TDB_DATA key, TDB_DATA new_dbuf)
        if (tdb_lock(tdb, BUCKET(hash), F_WRLCK) == -1)
                return -1;
 
-       dbuf = tdb_fetch(tdb, key);
-       tdb_trace(tdb, "tdb_append ");
-       tdb_trace_record(tdb, key);
-       tdb_trace_record(tdb, dbuf);
-       tdb_trace(tdb, "= %s\n", dbuf.dptr ? "insert" : "append");
+       dbuf = do_tdb_fetch(tdb, key);
 
        if (dbuf.dptr == NULL) {
                dbuf.dptr = (unsigned char *)malloc(new_dbuf.dsize);
@@ -644,7 +633,8 @@ int tdb_append(struct tdb_context *tdb, TDB_DATA key, TDB_DATA new_dbuf)
        memcpy(dbuf.dptr + dbuf.dsize, new_dbuf.dptr, new_dbuf.dsize);
        dbuf.dsize += new_dbuf.dsize;
 
-       ret = tdb_store(tdb, key, dbuf, 0);
+       ret = _tdb_store(tdb, key, dbuf, 0, hash);
+       tdb_trace_2rec_retrec(tdb, "tdb_append", key, new_dbuf, dbuf);
        
 failed:
        tdb_unlock(tdb, BUCKET(hash), F_WRLCK);
@@ -697,7 +687,7 @@ int tdb_get_seqnum(struct tdb_context *tdb)
        tdb_off_t seqnum=0;
 
        tdb_ofs_read(tdb, TDB_SEQNUM_OFS, &seqnum);
-       tdb_trace(tdb, "tdb_get_seqnum = %u\n", seqnum);
+       tdb_trace_ret(tdb, "tdb_get_seqnum", seqnum);
        return seqnum;
 }
 
@@ -779,7 +769,7 @@ int tdb_wipe_all(struct tdb_context *tdb)
                return -1;
        }
 
-       tdb_trace(tdb, "tdb_wipe_all\n");
+       tdb_trace(tdb, "tdb_wipe_all");
 
        /* see if the tdb has a recovery area, and remember its size
           if so. We don't want to lose this as otherwise each
@@ -854,31 +844,141 @@ failed:
 }
 
 #ifdef TDB_TRACE
-#include <stdarg.h>
+static void tdb_trace_write(struct tdb_context *tdb, const char *str)
+{
+       if (write(tdb->tracefd, str, strlen(str)) != strlen(str)) {
+               close(tdb->tracefd);
+               tdb->tracefd = -1;
+       }
+}
 
-void tdb_trace(const struct tdb_context *tdb, const char *fmt, ...)
+static void tdb_trace_start(struct tdb_context *tdb)
 {
-       char msg[256];
-       va_list args;
-       int len, err;
+       tdb_off_t seqnum=0;
+       char msg[sizeof(tdb_off_t) * 4];
+
+       tdb_ofs_read(tdb, TDB_SEQNUM_OFS, &seqnum);
+       sprintf(msg, "%u ", seqnum);
+       tdb_trace_write(tdb, msg);
+}
 
-       va_start(args, fmt);
-       len = vsprintf(msg, fmt, args);
-       va_end(args);
+static void tdb_trace_end(struct tdb_context *tdb)
+{
+       tdb_trace_write(tdb, "\n");
+}
 
-       err = write(tdb->tracefd, msg, len);
+static void tdb_trace_end_ret(struct tdb_context *tdb, int ret)
+{
+       char msg[sizeof(ret) * 4];
+       sprintf(msg, " = %i\n", ret);
+       tdb_trace_write(tdb, msg);
 }
 
-void tdb_trace_record(const struct tdb_context *tdb, TDB_DATA rec)
+static void tdb_trace_record(struct tdb_context *tdb, TDB_DATA rec)
 {
        char msg[20];
        unsigned int i;
-       int err;
 
-       err = write(tdb->tracefd, msg, sprintf(msg, "%zu:", rec.dsize));
-       for (i = 0; i < rec.dsize; i++)
-               err += write(tdb->tracefd, msg, sprintf(msg, "%02x",
-                                                       rec.dptr[i]));
-       err += write(tdb->tracefd, " ", 1);
+       /* We differentiate zero-length records from non-existent ones. */
+       if (rec.dptr == NULL) {
+               tdb_trace_write(tdb, " NULL");
+               return;
+       }
+       sprintf(msg, " %zu:", rec.dsize);
+       tdb_trace_write(tdb, msg);
+       for (i = 0; i < rec.dsize; i++) {
+               sprintf(msg, "%02x", rec.dptr[i]);
+               tdb_trace_write(tdb, msg);
+       }
+}
+
+void tdb_trace(struct tdb_context *tdb, const char *op)
+{
+       tdb_trace_start(tdb);
+       tdb_trace_write(tdb, op);
+       tdb_trace_end(tdb);
+}
+
+void tdb_trace_open(struct tdb_context *tdb, const char *op,
+                   unsigned hash_size, unsigned tdb_flags, unsigned open_flags)
+{
+       char msg[128];
+
+       sprintf(msg, "%s %u %#x %#x", op, hash_size, tdb_flags, open_flags);
+       tdb_trace_start(tdb);
+       tdb_trace_write(tdb, msg);
+       tdb_trace_end(tdb);
+}
+
+void tdb_trace_ret(struct tdb_context *tdb, const char *op, int ret)
+{
+       tdb_trace_start(tdb);
+       tdb_trace_write(tdb, op);
+       tdb_trace_end_ret(tdb, ret);
+}
+
+void tdb_trace_retrec(struct tdb_context *tdb, const char *op, TDB_DATA ret)
+{
+       tdb_trace_start(tdb);
+       tdb_trace_write(tdb, op);
+       tdb_trace_write(tdb, " =");
+       tdb_trace_record(tdb, ret);
+       tdb_trace_end(tdb);
+}
+
+void tdb_trace_1rec(struct tdb_context *tdb, const char *op,
+                   TDB_DATA rec)
+{
+       tdb_trace_start(tdb);
+       tdb_trace_write(tdb, op);
+       tdb_trace_record(tdb, rec);
+       tdb_trace_end(tdb);
+}
+
+void tdb_trace_1rec_ret(struct tdb_context *tdb, const char *op,
+                       TDB_DATA rec, int ret)
+{
+       tdb_trace_start(tdb);
+       tdb_trace_write(tdb, op);
+       tdb_trace_record(tdb, rec);
+       tdb_trace_end_ret(tdb, ret);
+}
+
+void tdb_trace_1rec_retrec(struct tdb_context *tdb, const char *op,
+                          TDB_DATA rec, TDB_DATA ret)
+{
+       tdb_trace_start(tdb);
+       tdb_trace_write(tdb, op);
+       tdb_trace_record(tdb, rec);
+       tdb_trace_write(tdb, " =");
+       tdb_trace_record(tdb, ret);
+       tdb_trace_end(tdb);
+}
+
+void tdb_trace_2rec_flag_ret(struct tdb_context *tdb, const char *op,
+                            TDB_DATA rec1, TDB_DATA rec2, unsigned flag,
+                            int ret)
+{
+       char msg[sizeof(ret) * 4];
+
+       sprintf(msg, " %#x", flag); 
+       tdb_trace_start(tdb);
+       tdb_trace_write(tdb, op);
+       tdb_trace_record(tdb, rec1);
+       tdb_trace_record(tdb, rec2);
+       tdb_trace_write(tdb, msg);
+       tdb_trace_end_ret(tdb, ret);
+}
+
+void tdb_trace_2rec_retrec(struct tdb_context *tdb, const char *op,
+                          TDB_DATA rec1, TDB_DATA rec2, TDB_DATA ret)
+{
+       tdb_trace_start(tdb);
+       tdb_trace_write(tdb, op);
+       tdb_trace_record(tdb, rec1);
+       tdb_trace_record(tdb, rec2);
+       tdb_trace_write(tdb, " =");
+       tdb_trace_record(tdb, ret);
+       tdb_trace_end(tdb);
 }
 #endif
index 4993ff811041e8d4fcdaf375a246a705eb9a0069..0ee5eb650c6fbbaca8f2807605d861490fe8ae7e 100644 (file)
@@ -89,15 +89,32 @@ typedef uint32_t tdb_off_t;
 #define TDB_LOG(x) tdb->log.log_fn x
 
 #ifdef TDB_TRACE
-void tdb_trace(const struct tdb_context *tdb, const char *fmt, ...);
-void tdb_trace_record(const struct tdb_context *tdb, TDB_DATA rec);
+void tdb_trace(struct tdb_context *tdb, const char *op);
+void tdb_trace_open(struct tdb_context *tdb, const char *op,
+                   unsigned hash_size, unsigned tdb_flags, unsigned open_flags);
+void tdb_trace_ret(struct tdb_context *tdb, const char *op, int ret);
+void tdb_trace_retrec(struct tdb_context *tdb, const char *op, TDB_DATA ret);
+void tdb_trace_1rec(struct tdb_context *tdb, const char *op,
+                   TDB_DATA rec);
+void tdb_trace_1rec_ret(struct tdb_context *tdb, const char *op,
+                       TDB_DATA rec, int ret);
+void tdb_trace_1rec_retrec(struct tdb_context *tdb, const char *op,
+                          TDB_DATA rec, TDB_DATA ret);
+void tdb_trace_2rec_flag_ret(struct tdb_context *tdb, const char *op,
+                            TDB_DATA rec1, TDB_DATA rec2, unsigned flag,
+                            int ret);
+void tdb_trace_2rec_retrec(struct tdb_context *tdb, const char *op,
+                          TDB_DATA rec1, TDB_DATA rec2, TDB_DATA ret);
 #else
-static inline void tdb_trace(const struct tdb_context *tdb, const char *fmt, ...)
-{
-}
-static inline void tdb_trace_record(const struct tdb_context *tdb, TDB_DATA rec)
-{
-}
+#define tdb_trace(tdb, op)
+#define tdb_trace_open(tdb, op, hash_size, tdb_flags, open_flags)
+#define tdb_trace_ret(tdb, op, ret)
+#define tdb_trace_retrec(tdb, op, ret)
+#define tdb_trace_1rec(tdb, op, rec)
+#define tdb_trace_1rec_ret(tdb, op, rec, ret)
+#define tdb_trace_1rec_retrec(tdb, op, rec, ret)
+#define tdb_trace_2rec_flag_ret(tdb, op, rec1, rec2, flag, ret)
+#define tdb_trace_2rec_retrec(tdb, op, rec1, rec2, ret)
 #endif /* !TDB_TRACE */
 
 /* lock offsets */
index 7c459353a681e6bd1666c533a3977c71af17112a..49e13732cf950f5bdd49c9d77f1398aa4f021371 100644 (file)
@@ -1,8 +1,14 @@
 LDLIBS:=-lccan
-CFLAGS:=-I../../.. -Wall -g -pg -O3
+CFLAGS:=-I../../.. -Wall -O3 #-g -pg
 LDFLAGS:=-L../../..
 
-default: replay_trace tdbtorture
+default: replay_trace tdbtorture tdbdump
+
+replay_trace: replay_trace.c keywords.c
+       $(LINK.c) $< $(LOADLIBES) $(LDLIBS) -o $@
+
+keywords.c: keywords.gperf
+       gperf $< > $@
 
 clean:
-       rm -f replay_trace tdbtorture *.o
+       rm -f replay_trace tdbtorture tdbdump *.o
diff --git a/ccan/tdb/tools/keywords.c b/ccan/tdb/tools/keywords.c
new file mode 100644 (file)
index 0000000..e105aea
--- /dev/null
@@ -0,0 +1,196 @@
+/* ANSI-C code produced by gperf version 3.0.3 */
+/* Command-line: gperf keywords.gperf  */
+/* Computed positions: -k'5,$' */
+
+#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
+      && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
+      && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
+      && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
+      && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
+      && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
+      && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
+      && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
+      && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
+      && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
+      && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
+      && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
+      && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
+      && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
+      && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
+      && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
+      && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
+      && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
+      && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
+      && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
+      && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
+      && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
+      && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
+/* The character set is not based on ISO-646.  */
+#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
+#endif
+
+#line 1 "keywords.gperf"
+
+#line 4 "keywords.gperf"
+struct op_table {
+       const char *name;
+       enum op_type type;
+       void (*enhance_op)(const char *filename,
+                          struct op op[], unsigned int op_num, char *words[]);
+};
+/* maximum key range = 43, duplicates = 0 */
+
+#ifdef __GNUC__
+__inline
+#else
+#ifdef __cplusplus
+inline
+#endif
+#endif
+static unsigned int
+hash_keyword (register const char *str, register unsigned int len)
+{
+  static const unsigned char asso_values[] =
+    {
+      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+      51, 51, 51, 51, 51, 51, 51, 15, 51, 25,
+       5,  0, 10,  0,  0,  0, 51,  0,  0,  0,
+      15, 51, 15, 51, 51,  0,  5,  0, 51,  0,
+      51, 15, 51, 51, 51, 51, 51, 51, 51, 51,
+      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+      51, 51, 51, 51, 51, 51
+    };
+  return len + asso_values[(unsigned char)str[4]] + asso_values[(unsigned char)str[len - 1]];
+}
+
+#ifdef __GNUC__
+__inline
+#ifdef __GNUC_STDC_INLINE__
+__attribute__ ((__gnu_inline__))
+#endif
+#endif
+const struct op_table *
+find_keyword (register const char *str, register unsigned int len)
+{
+  enum
+    {
+      TOTAL_KEYWORDS = 33,
+      MIN_WORD_LENGTH = 8,
+      MAX_WORD_LENGTH = 29,
+      MIN_HASH_VALUE = 8,
+      MAX_HASH_VALUE = 50
+    };
+
+  static const struct op_table wordlist[] =
+    {
+      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 44 "keywords.gperf"
+      {"traverse", OP_TDB_TRAVERSE, op_add_key_data,},
+#line 34 "keywords.gperf"
+      {"tdb_store", OP_TDB_STORE, op_add_store,},
+#line 33 "keywords.gperf"
+      {"tdb_exists", OP_TDB_EXISTS, op_add_key_ret,},
+#line 16 "keywords.gperf"
+      {"tdb_lockall", OP_TDB_LOCKALL, op_add_nothing,},
+#line 37 "keywords.gperf"
+      {"tdb_wipe_all", OP_TDB_WIPE_ALL, op_add_nothing,},
+#line 20 "keywords.gperf"
+      {"tdb_unlockall", OP_TDB_UNLOCKALL, op_add_nothing,},
+#line 36 "keywords.gperf"
+      {"tdb_get_seqnum", OP_TDB_GET_SEQNUM, op_add_seqnum,},
+#line 48 "keywords.gperf"
+      {"tdb_delete", OP_TDB_DELETE, op_add_key_ret,},
+#line 17 "keywords.gperf"
+      {"tdb_lockall_mark", OP_TDB_LOCKALL_MARK, op_add_nothing,},
+      {""},
+#line 18 "keywords.gperf"
+      {"tdb_lockall_unmark", OP_TDB_LOCKALL_UNMARK, op_add_nothing,},
+#line 47 "keywords.gperf"
+      {"tdb_fetch", OP_TDB_FETCH, op_add_key_data,},
+#line 19 "keywords.gperf"
+      {"tdb_lockall_nonblock", OP_TDB_LOCKALL_NONBLOCK, op_add_nothing,},
+#line 21 "keywords.gperf"
+      {"tdb_lockall_read", OP_TDB_LOCKALL_READ, op_add_nothing,},
+      {""},
+#line 23 "keywords.gperf"
+      {"tdb_unlockall_read", OP_TDB_UNLOCKALL_READ, op_add_nothing,},
+      {""},
+#line 22 "keywords.gperf"
+      {"tdb_lockall_read_nonblock", OP_TDB_LOCKALL_READ_NONBLOCK, op_add_nothing,},
+#line 43 "keywords.gperf"
+      {"tdb_traverse_end", OP_TDB_TRAVERSE_END, op_analyze_traverse,},
+#line 39 "keywords.gperf"
+      {"tdb_transaction_cancel", OP_TDB_TRANSACTION_CANCEL, op_add_nothing,},
+#line 42 "keywords.gperf"
+      {"tdb_traverse_start", OP_TDB_TRAVERSE_START, op_add_traverse,},
+#line 31 "keywords.gperf"
+      {"tdb_increment_seqnum_nonblock", OP_TDB_INCREMENT_SEQNUM_NONBLOCK, op_add_nothing,},
+#line 35 "keywords.gperf"
+      {"tdb_append", OP_TDB_APPEND, op_add_append,},
+#line 38 "keywords.gperf"
+      {"tdb_transaction_start", OP_TDB_TRANSACTION_START, op_add_nothing,},
+#line 40 "keywords.gperf"
+      {"tdb_transaction_commit", OP_TDB_TRANSACTION_COMMIT, op_add_nothing,},
+#line 41 "keywords.gperf"
+      {"tdb_traverse_read_start", OP_TDB_TRAVERSE_READ_START, op_add_traverse,},
+      {""}, {""},
+#line 32 "keywords.gperf"
+      {"tdb_parse_record", OP_TDB_PARSE_RECORD, op_add_key_ret,},
+#line 45 "keywords.gperf"
+      {"tdb_firstkey", OP_TDB_FIRSTKEY, op_add_key,},
+#line 24 "keywords.gperf"
+      {"tdb_chainlock", OP_TDB_CHAINLOCK, op_add_key,},
+      {""},
+#line 28 "keywords.gperf"
+      {"tdb_chainunlock", OP_TDB_CHAINUNLOCK, op_add_key,},
+#line 46 "keywords.gperf"
+      {"tdb_nextkey", OP_TDB_NEXTKEY, op_add_key_data,},
+      {""},
+#line 26 "keywords.gperf"
+      {"tdb_chainlock_mark", OP_TDB_CHAINLOCK_MARK, op_add_key,},
+      {""},
+#line 27 "keywords.gperf"
+      {"tdb_chainlock_unmark", OP_TDB_CHAINLOCK_UNMARK, op_add_key,},
+      {""},
+#line 25 "keywords.gperf"
+      {"tdb_chainlock_nonblock", OP_TDB_CHAINLOCK_NONBLOCK, op_add_key_ret,},
+#line 29 "keywords.gperf"
+      {"tdb_chainlock_read", OP_TDB_CHAINLOCK_READ, op_add_key,},
+      {""},
+#line 30 "keywords.gperf"
+      {"tdb_chainunlock_read", OP_TDB_CHAINUNLOCK_READ, op_add_key,}
+    };
+
+  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
+    {
+      register int key = hash_keyword (str, len);
+
+      if (key <= MAX_HASH_VALUE && key >= 0)
+        {
+          register const char *s = wordlist[key].name;
+
+          if (*str == *s && !strcmp (str + 1, s + 1))
+            return &wordlist[key];
+        }
+    }
+  return 0;
+}
diff --git a/ccan/tdb/tools/keywords.gperf b/ccan/tdb/tools/keywords.gperf
new file mode 100644 (file)
index 0000000..be2d06e
--- /dev/null
@@ -0,0 +1,48 @@
+%{
+%}
+%language=ANSI-C
+struct op_table {
+       const char *name;
+       enum op_type type;
+       void (*enhance_op)(const char *filename,
+                          struct op op[], unsigned int op_num, char *words[]);
+};
+%define hash-function-name hash_keyword
+%define lookup-function-name find_keyword
+%readonly-tables
+%struct-type
+%enum
+%%
+tdb_lockall, OP_TDB_LOCKALL, op_add_nothing,
+tdb_lockall_mark, OP_TDB_LOCKALL_MARK, op_add_nothing,
+tdb_lockall_unmark, OP_TDB_LOCKALL_UNMARK, op_add_nothing,
+tdb_lockall_nonblock, OP_TDB_LOCKALL_NONBLOCK, op_add_nothing,
+tdb_unlockall, OP_TDB_UNLOCKALL, op_add_nothing,
+tdb_lockall_read, OP_TDB_LOCKALL_READ, op_add_nothing,
+tdb_lockall_read_nonblock, OP_TDB_LOCKALL_READ_NONBLOCK, op_add_nothing,
+tdb_unlockall_read, OP_TDB_UNLOCKALL_READ, op_add_nothing,
+tdb_chainlock, OP_TDB_CHAINLOCK, op_add_key,
+tdb_chainlock_nonblock, OP_TDB_CHAINLOCK_NONBLOCK, op_add_key_ret,
+tdb_chainlock_mark, OP_TDB_CHAINLOCK_MARK, op_add_key,
+tdb_chainlock_unmark, OP_TDB_CHAINLOCK_UNMARK, op_add_key,
+tdb_chainunlock, OP_TDB_CHAINUNLOCK, op_add_key,
+tdb_chainlock_read, OP_TDB_CHAINLOCK_READ, op_add_key,
+tdb_chainunlock_read, OP_TDB_CHAINUNLOCK_READ, op_add_key,
+tdb_increment_seqnum_nonblock, OP_TDB_INCREMENT_SEQNUM_NONBLOCK, op_add_nothing,
+tdb_parse_record, OP_TDB_PARSE_RECORD, op_add_key_ret,
+tdb_exists, OP_TDB_EXISTS, op_add_key_ret,
+tdb_store, OP_TDB_STORE, op_add_store,
+tdb_append, OP_TDB_APPEND, op_add_append,
+tdb_get_seqnum, OP_TDB_GET_SEQNUM, op_add_seqnum,
+tdb_wipe_all, OP_TDB_WIPE_ALL, op_add_nothing,
+tdb_transaction_start, OP_TDB_TRANSACTION_START, op_add_nothing,
+tdb_transaction_cancel, OP_TDB_TRANSACTION_CANCEL, op_add_nothing,
+tdb_transaction_commit, OP_TDB_TRANSACTION_COMMIT, op_add_nothing,
+tdb_traverse_read_start, OP_TDB_TRAVERSE_READ_START, op_add_traverse,
+tdb_traverse_start, OP_TDB_TRAVERSE_START, op_add_traverse,
+tdb_traverse_end, OP_TDB_TRAVERSE_END, op_analyze_traverse,
+traverse, OP_TDB_TRAVERSE, op_add_key_data,
+tdb_firstkey, OP_TDB_FIRSTKEY, op_add_key,
+tdb_nextkey, OP_TDB_NEXTKEY, op_add_key_data,
+tdb_fetch, OP_TDB_FETCH, op_add_key_data,
+tdb_delete, OP_TDB_DELETE, op_add_key_ret,
index 2f9570718bdfd12106971cb501fbbb776a174cbc..f697a13787995395df869c2c742c46857ce5f13e 100644 (file)
@@ -4,25 +4,48 @@
 #include <ccan/talloc/talloc.h>
 #include <ccan/str_talloc/str_talloc.h>
 #include <ccan/str/str.h>
+#include <ccan/list/list.h>
 #include <err.h>
 #include <ctype.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/wait.h>
 #include <sys/time.h>
 
 #define STRINGIFY2(x) #x
 #define STRINGIFY(x) STRINGIFY2(x)
 
+/* Avoid mod by zero */
+static unsigned int total_keys = 1;
+
+/* #define DEBUG_DEPS 1 */
+
+struct pipe {
+       int fd[2];
+};
+static struct pipe *pipes;
+
+static void __attribute__((noreturn)) fail(const char *filename,
+                                          unsigned int line,
+                                          const char *fmt, ...)
+{
+       va_list ap;
+
+       va_start(ap, fmt);
+       fprintf(stderr, "%s:%u: FAIL: ", filename, line);
+       vfprintf(stderr, fmt, ap);
+       fprintf(stderr, "\n");
+       va_end(ap);
+       exit(1);
+}
+       
 /* Try or die. */
-#define try(expr, op)                                                  \
+#define try(expr, expect)                                              \
        do {                                                            \
                int ret = (expr);                                       \
-               if (ret < 0) {                                          \
-                       if (tdb_error(tdb) != -op.ret)                  \
-                               errx(1, "Line %u: " STRINGIFY(expr)     \
-                                    "= %i: %s",                        \
-                                    i+1, ret, tdb_errorstr(tdb));      \
-               } else if (ret != op.ret)                               \
-                       errx(1, "Line %u: " STRINGIFY(expr) "= %i: %s", \
-                            i+1, ret, tdb_errorstr(tdb));              \
+               if (ret != (expect))                                    \
+                       fail(filename, i+1, STRINGIFY(expr) "= %i", ret); \
        } while (0)
 
 /* Try or imitate results. */
@@ -30,8 +53,8 @@
        do {                                                            \
                int ret = expr;                                         \
                if (ret != expect) {                                    \
-                       warnx("Line %u: %s gave %i not %i",             \
-                             i+1, STRINGIFY(expr), ret, expect);       \
+                       fprintf(stderr, "%s:%u: %s gave %i not %i",     \
+                             filename, i+1, STRINGIFY(expr), ret, expect); \
                        if (expect == 0)                                \
                                force;                                  \
                        else                                            \
@@ -46,6 +69,19 @@ static bool key_eq(TDB_DATA a, TDB_DATA b)
        return memcmp(a.dptr, b.dptr, a.dsize) == 0;
 }
 
+/* This is based on the hash algorithm from gdbm */
+static unsigned int hash_key(TDB_DATA *key)
+{
+       uint32_t value; /* Used to compute the hash value.  */
+       uint32_t   i;   /* Used to cycle through random values. */
+
+       /* Set the initial value from the key size. */
+       for (value = 0x238F13AF ^ key->dsize, i=0; i < key->dsize; i++)
+               value = (value + (key->dptr[i] << (i*5 % 24)));
+
+       return (1103515243 * value + 12345);  
+}
+
 enum op_type {
        OP_TDB_LOCKALL,
        OP_TDB_LOCKALL_MARK,
@@ -80,73 +116,167 @@ enum op_type {
        OP_TDB_NEXTKEY,
        OP_TDB_FETCH,
        OP_TDB_DELETE,
-       OP_TDB_CLOSE,
 };
 
 struct op {
+       unsigned int serial;
        enum op_type op;
        TDB_DATA key;
        TDB_DATA data;
        int ret;
+       /* Who is waiting for us? */
+       struct list_head post;
+       /* How many are we waiting for? */
+       unsigned int pre;
+
        union {
                int flag; /* open and store */
                struct traverse *trav; /* traverse start */
+               TDB_DATA post_append; /* append */
        };
 };
 
-static unsigned char hex_char(unsigned int line, char c)
+static unsigned char hex_char(const char *filename, unsigned int line, char c)
 {
        c = toupper(c);
        if (c >= 'A' && c <= 'F')
                return c - 'A' + 10;
        if (c >= '0' && c <= '9')
                return c - '0';
-       errx(1, "Line %u: invalid hex character '%c'", line, c);
+       fail(filename, line, "invalid hex character '%c'", c);
 }
 
 /* TDB data is <size>:<%02x>* */
 static TDB_DATA make_tdb_data(const void *ctx,
-                             unsigned int line, const char *word)
+                             const char *filename, unsigned int line,
+                             const char *word)
 {
        TDB_DATA data;
        unsigned int i;
        const char *p;
 
+       if (streq(word, "NULL"))
+               return tdb_null;
+
        data.dsize = atoi(word);
        data.dptr = talloc_array(ctx, unsigned char, data.dsize);
        p = strchr(word, ':');
        if (!p)
-               errx(1, "Line %u: Invalid tdb data '%s'", line, word);
+               fail(filename, line, "invalid tdb data '%s'", word);
        p++;
        for (i = 0; i < data.dsize; i++)
-               data.dptr[i] = hex_char(line, p[i*2])*16
-                       + hex_char(line, p[i*2+1]);
+               data.dptr[i] = hex_char(filename, line, p[i*2])*16
+                       + hex_char(filename, line, p[i*2+1]);
+
        return data;
 }
 
-static struct op *add_op(struct op **op, unsigned int i,
-                        enum op_type type, const char *key, const char *data,
-                        int ret)
+static void add_op(const char *filename, struct op **op, unsigned int i,
+                  unsigned int serial, enum op_type type)
 {
        struct op *new;
        *op = talloc_realloc(NULL, *op, struct op, i+1);
        new = (*op) + i;
        new->op = type;
-       new->ret = ret;
-       if (key)
-               new->key = make_tdb_data(*op, i+1, key);
-       else
-               new->key = tdb_null;
-       if (data)
-               new->data = make_tdb_data(*op, i+1, data);
-       else
-               new->data = tdb_null;
-       return new;
+       new->serial = serial;
+       new->pre = 0;
+       new->ret = 0;
 }
 
-static int get_len(TDB_DATA key, TDB_DATA data, void *private_data)
+static void op_add_nothing(const char *filename,
+                          struct op op[], unsigned int op_num, char *words[])
 {
-       return data.dsize;
+       if (words[2])
+               fail(filename, op_num+1, "Expected no arguments");
+       op[op_num].key = tdb_null;
+}
+
+static void op_add_key(const char *filename,
+                      struct op op[], unsigned int op_num, char *words[])
+{
+       if (words[2] == NULL || words[3])
+               fail(filename, op_num+1, "Expected just a key");
+
+       op[op_num].key = make_tdb_data(op, filename, op_num+1, words[2]);
+       if (op[op_num].op != OP_TDB_TRAVERSE)
+               total_keys++;
+}
+
+static void op_add_key_ret(const char *filename,
+                          struct op op[], unsigned int op_num, char *words[])
+{
+       if (!words[2] || !words[3] || !words[4] || words[5]
+           || !streq(words[3], "="))
+               fail(filename, op_num+1, "Expected <key> = <ret>");
+       op[op_num].ret = atoi(words[4]);
+       op[op_num].key = make_tdb_data(op, filename, op_num+1, words[2]);
+       /* May only be a unique key if it fails */
+       if (op[op_num].ret != 0)
+               total_keys++;
+}
+
+static void op_add_key_data(const char *filename,
+                           struct op op[], unsigned int op_num, char *words[])
+{
+       if (!words[2] || !words[3] || !words[4] || words[5]
+           || !streq(words[3], "="))
+               fail(filename, op_num+1, "Expected <key> = <data>");
+       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[4]);
+       /* May only be a unique key if it fails */
+       if (!op[op_num].data.dptr)
+               total_keys++;
+}
+
+/* <serial> tdb_store <rec> <rec> <flag> = <ret> */
+static void op_add_store(const char *filename,
+                        struct op op[], unsigned int op_num, char *words[])
+{
+       if (!words[2] || !words[3] || !words[4] || !words[5] || !words[6]
+           || words[7] || !streq(words[5], "="))
+               fail(filename, op_num+1, "Expect <key> <data> <flag> = <ret>");
+
+       op[op_num].flag = strtoul(words[4], NULL, 0);
+       op[op_num].ret = atoi(words[6]);
+       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]);
+       total_keys++;
+}
+
+/* <serial> tdb_append <rec> <rec> = <rec> */
+static void op_add_append(const char *filename,
+                         struct op op[], unsigned int op_num, char *words[])
+{
+       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]);
+       op[op_num].post_append
+               = make_tdb_data(op, filename, op_num+1, words[5]);
+       total_keys++;
+}
+
+/* <serial> tdb_get_seqnum = <ret> */
+static void op_add_seqnum(const char *filename,
+                         struct op op[], unsigned int op_num, char *words[])
+{
+       if (!words[2] || !words[3] || words[4] || !streq(words[2], "="))
+               fail(filename, op_num+1, "Expect = <ret>");
+
+       op[op_num].key = tdb_null;
+       op[op_num].ret = atoi(words[3]);
+}
+
+static void op_add_traverse(const char *filename,
+                           struct op op[], unsigned int op_num, char *words[])
+{
+       if (words[2])
+               fail(filename, op_num+1, "Expect no arguments");
+
+       op[op_num].key = tdb_null;
+       op[op_num].trav = NULL;
 }
 
 struct traverse_hash {
@@ -166,24 +296,12 @@ struct traverse {
        struct traverse_hash *hash;
 };
 
-/* This is based on the hash algorithm from gdbm */
-static unsigned int hash_key(TDB_DATA *key)
-{
-       uint32_t value; /* Used to compute the hash value.  */
-       uint32_t   i;   /* Used to cycle through random values. */
-
-       /* Set the initial value from the key size. */
-       for (value = 0x238F13AF ^ key->dsize, i=0; i < key->dsize; i++)
-               value = (value + (key->dptr[i] << (i*5 % 24)));
-
-       return (1103515243 * value + 12345);  
-}
-
 /* 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;
 
@@ -199,16 +317,29 @@ static bool is_trivial_traverse(struct op op[], unsigned int end)
                        return false;
        }
        return true;
+#endif
+       /* With multiple things happening at once, no traverse is trivial. */
+       return false;
 }
 
-static void analyze_traverse(struct op op[], unsigned int end)
+static void op_analyze_traverse(const char *filename,
+                               struct op op[], unsigned int op_num,
+                               char *words[])
 {
        int i;
        struct traverse *trav = talloc(op, struct traverse);
 
+       /* = %u means traverse function terminated. */
+       if (words[2]) {
+               if (!streq(words[2], "=") || !words[3] || words[4])
+                       fail(filename, op_num+1, "expect = <num>");
+               op[op_num].ret = atoi(words[3]);
+       } else
+               op[op_num].ret = 0;
+
        trav->num = 0;
-       trav->end = end;
-       for (i = end-1; i >= 0; i--) {
+       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
@@ -220,16 +351,16 @@ static void analyze_traverse(struct op op[], unsigned int end)
        }
 
        if (i < 0)
-               errx(1, "Line %u: no traversal start found", end+1);
+               fail(filename, op_num+1, "no traversal start found");
 
        op[i].trav = trav;
 
-       if (is_trivial_traverse(op+i, end-i)) {
+       if (is_trivial_traverse(op+i, op_num-i)) {
                /* Fill in a plentiful hash table. */
                op[i].trav->hash = talloc_zero_array(op[i].trav,
                                                     struct traverse_hash,
                                                     trav->num * 2);
-               for (; i < end; i++) {
+               for (; i < op_num; i++) {
                        unsigned int h;
                        if (op[i].op != OP_TDB_TRAVERSE)
                                continue;
@@ -243,11 +374,27 @@ static void analyze_traverse(struct op op[], unsigned int end)
                trav->hash = NULL;
 }
 
-static unsigned run_ops(struct tdb_context *tdb, const struct op op[],
+/* Keep -Wmissing-declarations happy: */
+const struct op_table *
+find_keyword (register const char *str, register unsigned int len);
+
+#include "keywords.c"
+
+static int get_len(TDB_DATA key, TDB_DATA data, void *private_data)
+{
+       return data.dsize;
+}
+
+static unsigned run_ops(struct tdb_context *tdb,
+                       int pre_fd,
+                       const char *filename,
+                       struct op op[],
                        unsigned int start, unsigned int stop);
 
 struct traverse_info {
-       const struct op *op;
+       struct op *op;
+       const char *filename;
+       int pre_fd;
        unsigned int start;
        unsigned int i;
 };
@@ -263,13 +410,14 @@ static int trivial_traverse(struct tdb_context *tdb,
 
        while (trav->hash[h].index) {
                if (key_eq(trav->hash[h].key, key)) {
-                       run_ops(tdb, tinfo->op, trav->hash[h].index, trav->end);
+                       run_ops(tdb, tinfo->pre_fd, tinfo->filename, tinfo->op,
+                               trav->hash[h].index, trav->end);
                        tinfo->i++;
                        return 0;
                }
                h = (h + 1) % (trav->num * 2);
        }
-       errx(1, "Traverse at %u: unexpected key", tinfo->start + 1);
+       fail(tinfo->filename, tinfo->start + 1, "unexpected traverse key");
 }
 
 /* More complex.  Just do whatever's they did at the n'th entry. */
@@ -280,36 +428,44 @@ static int nontrivial_traverse(struct tdb_context *tdb,
        struct traverse_info *tinfo = _tinfo;
        struct traverse *trav = tinfo->op[tinfo->start].trav;
 
-       if (tinfo->i == trav->end)
-               errx(1, "Transaction starting line %u did not terminate",
-                    tinfo->start + 1);
+       if (tinfo->i == trav->end) {
+               /* This can happen if traverse expects to be empty. */
+               if (tinfo->start + 1 == trav->end)
+                       return 1;
+               fail(tinfo->filename, tinfo->start + 1,
+                    "traverse did not terminate");
+       }
 
        if (tinfo->op[tinfo->i].op != OP_TDB_TRAVERSE)
-               errx(1, "Transaction starting line %u terminated early",
-                    tinfo->start + 1);
+               fail(tinfo->filename, tinfo->start + 1,
+                    "%s:%u:traverse terminated early");
 
        /* Run any normal ops. */
-       tinfo->i = run_ops(tdb, tinfo->op, tinfo->i+1, trav->end);
+       tinfo->i = run_ops(tdb, tinfo->pre_fd, tinfo->filename, tinfo->op,
+                          tinfo->i+1, trav->end);
 
        if (tinfo->i == trav->end)
                return 1;
+
        return 0;
 }
 
 static unsigned op_traverse(struct tdb_context *tdb,
+                           int pre_fd,
+                           const char *filename,
                            int (*traversefn)(struct tdb_context *,
                                              tdb_traverse_func, void *),
-                           const struct op op[],
+                           struct op op[],
                            unsigned int start)
 {
        struct traverse *trav = op[start].trav;
-       struct traverse_info tinfo = { op, start, start+1 };
+       struct traverse_info tinfo = { op, filename, pre_fd, start, start+1 };
 
        /* Trivial case. */
        if (trav->hash) {
                int ret = traversefn(tdb, trivial_traverse, &tinfo);
                if (ret != trav->num)
-                       errx(1, "Line %u: short traversal %i", start+1, ret);
+                       fail(filename, start+1, "short traversal %i", ret);
                return trav->end;
        }
 
@@ -322,38 +478,88 @@ static unsigned op_traverse(struct tdb_context *tdb,
                if (op[tinfo.i].op == OP_TDB_TRAVERSE)
                        tinfo.i++;
                else
-                       tinfo.i = run_ops(tdb, op, tinfo.i, trav->end);
+                       tinfo.i = run_ops(tdb, pre_fd, filename, op,
+                                         tinfo.i, trav->end);
        }
        return trav->end;
 }
 
+struct depend {
+       /* We can have more than one */
+       struct list_node list;
+       unsigned int file;
+       unsigned int op;
+};
+
+static void do_pre(const char *filename, int pre_fd,
+                  struct op op[], unsigned int i)
+{
+       while (op[i].pre != 0) {
+               unsigned int opnum;
+
+#if DEBUG_DEPS
+               printf("%s:%u:waiting for pre\n", filename, i+1);
+#endif
+               if (read(pre_fd, &opnum, sizeof(opnum)) != sizeof(opnum))
+                       errx(1, "Reading from pipe");
+
+#if DEBUG_DEPS
+               printf("%s:%u:got pre %u\n",
+                      filename, i+1, opnum);
+#endif
+               /* This could be any op, not just this one. */
+               if (op[opnum].pre == 0)
+                       errx(1, "Got unexpected notification for op line %u",
+                            opnum + 1);
+               op[opnum].pre--;
+       }
+}
+
+static void do_post(const char *filename, const struct op op[], unsigned int i)
+{
+       struct depend *dep;
+
+       list_for_each(&op[i].post, dep, list) {
+#if DEBUG_DEPS
+               printf("%s:%u:sending %u to file %u\n", filename, i+1,
+                      dep->op, dep->file);
+#endif
+               if (write(pipes[dep->file].fd[1], &dep->op, sizeof(dep->op))
+                   != sizeof(dep->op))
+                       err(1, "Failed to tell file %u", dep->file);
+       }
+}
+
 static __attribute__((noinline))
-unsigned run_ops(struct tdb_context *tdb, const struct op op[],
-                       unsigned int start, unsigned int stop)
+unsigned run_ops(struct tdb_context *tdb,
+                int pre_fd,
+                const char *filename,
+                struct op op[], unsigned int start, unsigned int stop)
 {
        unsigned int i;
-       TDB_DATA data;
 
        for (i = start; i < stop; i++) {
+               do_pre(filename, pre_fd, op, i);
+
                switch (op[i].op) {
                case OP_TDB_LOCKALL:
-                       try(tdb_lockall(tdb), op[i]);
+                       try(tdb_lockall(tdb), op[i].ret);
                        break;
                case OP_TDB_LOCKALL_MARK:
-                       try(tdb_lockall_mark(tdb), op[i]);
+                       try(tdb_lockall_mark(tdb), op[i].ret);
                        break;
                case OP_TDB_LOCKALL_UNMARK:
-                       try(tdb_lockall_unmark(tdb), op[i]);
+                       try(tdb_lockall_unmark(tdb), op[i].ret);
                        break;
                case OP_TDB_LOCKALL_NONBLOCK:
                        unreliable(tdb_lockall_nonblock(tdb), op[i].ret,
                                   tdb_lockall(tdb), tdb_unlockall(tdb));
                        break;
                case OP_TDB_UNLOCKALL:
-                       try(tdb_unlockall(tdb), op[i]);
+                       try(tdb_unlockall(tdb), op[i].ret);
                        break;
                case OP_TDB_LOCKALL_READ:
-                       try(tdb_lockall_read(tdb), op[i]);
+                       try(tdb_lockall_read(tdb), op[i].ret);
                        break;
                case OP_TDB_LOCKALL_READ_NONBLOCK:
                        unreliable(tdb_lockall_read_nonblock(tdb), op[i].ret,
@@ -361,10 +567,10 @@ unsigned run_ops(struct tdb_context *tdb, const struct op op[],
                                   tdb_unlockall_read(tdb));
                        break;
                case OP_TDB_UNLOCKALL_READ:
-                       try(tdb_unlockall_read(tdb), op[i]);
+                       try(tdb_unlockall_read(tdb), op[i].ret);
                        break;
                case OP_TDB_CHAINLOCK:
-                       try(tdb_chainlock(tdb, op[i].key), op[i]);
+                       try(tdb_chainlock(tdb, op[i].key), op[i].ret);
                        break;
                case OP_TDB_CHAINLOCK_NONBLOCK:
                        unreliable(tdb_chainlock_nonblock(tdb, op[i].key),
@@ -373,265 +579,375 @@ unsigned run_ops(struct tdb_context *tdb, const struct op op[],
                                   tdb_chainunlock(tdb, op[i].key));
                        break;
                case OP_TDB_CHAINLOCK_MARK:
-                       try(tdb_chainlock_mark(tdb, op[i].key), op[i]);
+                       try(tdb_chainlock_mark(tdb, op[i].key), op[i].ret);
                        break;
                case OP_TDB_CHAINLOCK_UNMARK:
-                       try(tdb_chainlock_unmark(tdb, op[i].key), op[i]);
+                       try(tdb_chainlock_unmark(tdb, op[i].key), op[i].ret);
                        break;
                case OP_TDB_CHAINUNLOCK:
-                       try(tdb_chainunlock(tdb, op[i].key), op[i]);
+                       try(tdb_chainunlock(tdb, op[i].key), op[i].ret);
                        break;
                case OP_TDB_CHAINLOCK_READ:
-                       try(tdb_chainlock_read(tdb, op[i].key), op[i]);
+                       try(tdb_chainlock_read(tdb, op[i].key), op[i].ret);
                        break;
                case OP_TDB_CHAINUNLOCK_READ:
-                       try(tdb_chainunlock_read(tdb, op[i].key), op[i]);
+                       try(tdb_chainunlock_read(tdb, op[i].key), op[i].ret);
                        break;
                case OP_TDB_INCREMENT_SEQNUM_NONBLOCK:
                        tdb_increment_seqnum_nonblock(tdb);
                        break;
                case OP_TDB_PARSE_RECORD:
-                       try(tdb_parse_record(tdb, op[i].key, get_len, NULL), op[i]);
+                       try(tdb_parse_record(tdb, op[i].key, get_len, NULL),
+                           op[i].ret);
                        break;
                case OP_TDB_EXISTS:
-                       try(tdb_exists(tdb, op[i].key), op[i]);
+                       try(tdb_exists(tdb, op[i].key), op[i].ret);
                        break;
                case OP_TDB_STORE:
-                       try(tdb_store(tdb, op[i].key, op[i].data, op[i].flag), op[i]);
+                       try(tdb_store(tdb, op[i].key, op[i].data, op[i].flag),
+                           op[i].ret < 0 ? op[i].ret : 0);
                        break;
                case OP_TDB_APPEND:
-                       try(tdb_append(tdb, op[i].key, op[i].data), op[i]);
+                       try(tdb_append(tdb, op[i].key, op[i].data),
+                           op[i].ret < 0 ? op[i].ret : 0);
                        break;
                case OP_TDB_GET_SEQNUM:
-                       try(tdb_get_seqnum(tdb), op[i]);
+                       try(tdb_get_seqnum(tdb), op[i].ret);
                        break;
                case OP_TDB_WIPE_ALL:
-                       try(tdb_wipe_all(tdb), op[i]);
+                       try(tdb_wipe_all(tdb), op[i].ret);
                        break;
                case OP_TDB_TRANSACTION_START:
-                       try(tdb_transaction_start(tdb), op[i]);
+                       try(tdb_transaction_start(tdb), op[i].ret);
                        break;
                case OP_TDB_TRANSACTION_CANCEL:
-                       try(tdb_transaction_cancel(tdb), op[i]);
+                       try(tdb_transaction_cancel(tdb), op[i].ret);
                        break;
                case OP_TDB_TRANSACTION_COMMIT:
-                       try(tdb_transaction_commit(tdb), op[i]);
+                       try(tdb_transaction_commit(tdb), op[i].ret);
                        break;
                case OP_TDB_TRAVERSE_READ_START:
-                       i = op_traverse(tdb, tdb_traverse_read, op, i);
+                       i = op_traverse(tdb, pre_fd, filename,
+                                       tdb_traverse_read, op, i);
                        break;
                case OP_TDB_TRAVERSE_START:
-                       i = op_traverse(tdb, tdb_traverse, op, i);
+                       i = op_traverse(tdb, pre_fd, filename,
+                                       tdb_traverse, op, i);
                        break;
                case OP_TDB_TRAVERSE:
                        /* Terminate: we're in a traverse, and we've
                         * done our ops. */
                        return i;
                case OP_TDB_TRAVERSE_END:
-                       errx(1, "Line %u: unepxected end traverse\n", i+1);
+                       fail(filename, i+1, "unepxected end traverse");
+               /* FIXME: These must be treated like traverse. */
                case OP_TDB_FIRSTKEY:
-                       data = tdb_firstkey(tdb);
-                       if (data.dsize != op[i].data.dsize
-                           || memcmp(data.dptr, op[i].data.dptr, data.dsize))
-                               errx(1, "Line %u: bad firstkey", i+1);
+                       if (!key_eq(tdb_firstkey(tdb), op[i].data))
+                               fail(filename, i+1, "bad firstkey");
                        break;
                case OP_TDB_NEXTKEY:
-                       data = tdb_nextkey(tdb, op[i].key);
-                       if (data.dsize != op[i].data.dsize
-                           || memcmp(data.dptr, op[i].data.dptr, data.dsize))
-                               errx(1, "Line %u: bad nextkey", i+1);
+                       if (!key_eq(tdb_nextkey(tdb, op[i].key), op[i].data))
+                               fail(filename, i+1, "bad nextkey");
                        break;
-               case OP_TDB_FETCH:
-                       data = tdb_fetch(tdb, op[i].key);
-                       if (data.dsize != op[i].data.dsize
-                           || memcmp(data.dptr, op[i].data.dptr, data.dsize))
-                               errx(1, "Line %u: bad fetch", i+1);
+               case OP_TDB_FETCH: {
+                       TDB_DATA f = tdb_fetch(tdb, op[i].key);
+                       if (!key_eq(f, op[i].data))
+                               fail(filename, i+1, "bad fetch %u", f.dsize);
                        break;
+               }
                case OP_TDB_DELETE:
-                       try(tdb_delete(tdb, op[i].key), op[i]);
-                       break;
-               case OP_TDB_CLOSE:
-                       errx(1, "Line %u: unexpected close", i+1);
+                       try(tdb_delete(tdb, op[i].key), op[i].ret);
                        break;
                }
+               do_post(filename, op, i);
        }
        return i;
 }
 
-int main(int argc, char *argv[])
+static struct op *load_tracefile(const char *filename, unsigned int *num,
+                                unsigned int *hashsize,
+                                unsigned int *tdb_flags,
+                                unsigned int *open_flags)
 {
-       const char *file;
-       char **lines;
        unsigned int i;
-       struct tdb_context *tdb = NULL;
        struct op *op = talloc_array(NULL, struct op, 1);
-       struct timeval start, end;
-
-       if (argc != 3)
-               errx(1, "Usage: %s <tracefile> <tdbfile>", argv[0]);
+       char **words;
+       char **lines;
+       char *file;
 
-       file = grab_file(NULL, argv[1], NULL);
+       file = grab_file(NULL, filename, NULL);
        if (!file)
-               err(1, "Reading %s", argv[1]);
+               err(1, "Reading %s", filename);
 
        lines = strsplit(file, file, "\n", NULL);
+       if (!lines[0])
+               errx(1, "%s is empty", filename);
+
+       words = strsplit(lines, lines[0], " ", NULL);
+       if (!streq(words[1], "tdb_open"))
+               fail(filename, 1, "does not start with tdb_open");
+
+       *hashsize = atoi(words[2]);
+       *tdb_flags = strtoul(words[3], NULL, 0);
+       *open_flags = strtoul(words[4], NULL, 0);
+
+       for (i = 1; lines[i]; i++) {
+               const struct op_table *opt;
+
+               words = strsplit(lines, lines[i], " ", NULL);
+               if (!words[0] || !words[1])
+                       fail(filename, i+1, "Expected serial number and op");
+              
+               opt = find_keyword(words[1], strlen(words[1]));
+               if (!opt) {
+                       if (streq(words[1], "tdb_close")) {
+                               if (lines[i+1])
+                                       fail(filename, i+2,
+                                            "lines after tdb_close");
+                               *num = i;
+                               talloc_free(lines);
+                               return op;
+                       }
+                       fail(filename, i+1, "Unknown operation '%s'", words[1]);
+               }
+
+               add_op(filename, &op, i, atoi(words[0]), opt->type);
+               opt->enhance_op(filename, op, i, words);
+       }
+
+       fprintf(stderr, "%s:%u:last operation is not tdb_close: incomplete?",
+             filename, i);
+       talloc_free(lines);
+       *num = i - 1;
+       return op;
+}
+
+/* We remember all the keys we've ever seen, and who has them. */
+struct key_user {
+       unsigned int file;
+       unsigned int op_num;
+};
+
+struct keyinfo {
+       TDB_DATA key;
+       unsigned int num_users;
+       struct key_user *user;
+};
+
+static bool changes_db(const struct op *op)
+{
+       if (op->ret != 0)
+               return false;
+
+       return op->op == OP_TDB_STORE
+               || op->op == OP_TDB_APPEND
+               || op->op == OP_TDB_WIPE_ALL
+               || op->op == OP_TDB_TRANSACTION_COMMIT
+               || op->op == OP_TDB_DELETE;
+}
+
+static struct keyinfo *hash_ops(struct op *op[], unsigned int num_ops[],
+                               unsigned int num)
+{
+       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;
+
+               /* Fetches don't inc serial, so we put changes first. */
+               if (ret == 0) {
+                       if (changes_db(&op[a->file][a->op_num])
+                           && !changes_db(&op[b->file][b->op_num]))
+                               return -1;
+                       if (changes_db(&op[b->file][b->op_num])
+                           && !changes_db(&op[a->file][a->op_num]))
+                               return 1;
+               }
+               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++) {
+                       /* We can't do this on allocation, due to realloc. */
+                       list_head_init(&op[i][j].post);
+
+                       if (!op[i][j].key.dptr)
+                               continue;
 
-       for (i = 0; lines[i]; i++) {
-               char **words = strsplit(lines, lines[i], " ", NULL);
-               if (!tdb && !streq(words[0], "tdb_open"))
-                       errx(1, "Line %u is not tdb_open", i+1);
-
-               if (streq(words[0], "tdb_open")) {
-                       if (tdb)
-                               errx(1, "Line %u: tdb_open again?", i+1);
-                       tdb = tdb_open_ex(argv[2], atoi(words[2]),
-                                         strtoul(words[3], NULL, 0),
-                                         strtoul(words[4], NULL, 0), 0600,
+                       /* We don't wait for traverse keys */
+                       /* FIXME: We should, for trivial traversals. */
+                       if (op[i][j].op == OP_TDB_TRAVERSE)
+                               continue;
+
+                       h = hash_key(&op[i][j].key) % (total_keys * 2);
+                       while (!key_eq(hash[h].key, op[i][j].key)) {
+                               if (!hash[h].key.dptr) {
+                                       hash[h].key = op[i][j].key;
+                                       break;
+                               }
+                               h = (h + 1) % (total_keys * 2);
+                       }
+                       /* Might as well save some memory if we can. */
+                       if (op[i][j].key.dptr != hash[h].key.dptr) {
+                               talloc_free(op[i][j].key.dptr);
+                               op[i][j].key.dptr = hash[h].key.dptr;
+                       }
+                       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;
+                       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 void add_dependency(void *ctx,
+                          struct op *op[],
+                          unsigned int needs_file,
+                          unsigned int needs_opnum,
+                          unsigned int satisfies_file,
+                          unsigned int satisfies_opnum)
+{
+       struct depend *post;
+
+       post = talloc(ctx, struct depend);
+       post->file = needs_file;
+       post->op = needs_opnum;
+       list_add(&op[satisfies_file][satisfies_opnum].post, &post->list);
+
+       op[needs_file][needs_opnum].pre++;
+}
+
+static void derive_dependencies(char *filename[],
+                               struct op *op[], unsigned int num_ops[],
+                               unsigned int num)
+{
+       struct keyinfo *hash;
+       unsigned int 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++) {
+               unsigned int j;
+
+               for (j = 1; j < hash[i].num_users; j++) {
+                       /* We don't depend on ourselves. */
+                       if (hash[i].user[j].file == hash[i].user[j-1].file)
+                               continue;
+#if DEBUG_DEPS
+                       printf("%s:%u: depends on %s:%u\n",
+                              filename[hash[i].user[j].file],
+                              hash[i].user[j].op_num+1,
+                              filename[hash[i].user[j-1].file],
+                              hash[i].user[j-1].op_num+1);
+#endif
+                       add_dependency(hash, op,
+                                      hash[i].user[j].file,
+                                      hash[i].user[j].op_num,
+                                      hash[i].user[j-1].file,
+                                      hash[i].user[j-1].op_num);
+               }
+       }
+}
+
+int main(int argc, char *argv[])
+{
+       struct timeval start, end;
+       unsigned int i, num_ops[argc], hashsize[argc], tdb_flags[argc], open_flags[argc];
+       struct op *op[argc];
+       int fds[2];
+       char c;
+
+       if (argc < 3)
+               errx(1, "Usage: %s <tdbfile> <tracefile>...", argv[0]);
+
+       pipes = talloc_array(NULL, struct pipe, argc - 2);
+       for (i = 0; i < argc - 2; i++) {
+               op[i] = load_tracefile(argv[2+i], &num_ops[i], &hashsize[i],
+                                      &tdb_flags[i], &open_flags[i]);
+               if (pipe(pipes[i].fd) != 0)
+                       err(1, "creating pipe");
+       }
+
+       derive_dependencies(argv+2, op, num_ops, i);
+
+       /* Don't fork for single arg case: simple debugging. */
+       if (argc == 3) {
+               struct tdb_context *tdb;
+               tdb = tdb_open_ex(argv[1], hashsize[0], tdb_flags[0],
+                                 open_flags[0], 0600,
+                                 NULL, hash_key);
+               run_ops(tdb, pipes[0].fd[0], argv[2],
+                       op[0], 1, num_ops[0]);
+               exit(0);
+       }
+
+       if (pipe(fds) != 0)
+               err(1, "creating pipe");
+
+       for (i = 0; i < argc - 2; i++) {
+               struct tdb_context *tdb;
+
+               switch (fork()) {
+               case -1:
+                       err(1, "fork failed");
+               case 0:
+                       close(fds[1]);
+                       tdb = tdb_open_ex(argv[1], hashsize[i], tdb_flags[i],
+                                         open_flags[i], 0600,
                                          NULL, hash_key);
                        if (!tdb)
-                               err(1, "Opening tdb %s", argv[2]);
-               } else if (streq(words[0], "tdb_lockall")) {
-                       add_op(&op, i, OP_TDB_LOCKALL, NULL, NULL, 0);
-               } else if (streq(words[0], "tdb_lockall_mark")) {
-                       add_op(&op, i, OP_TDB_LOCKALL_MARK, NULL, NULL, 0);
-               } else if (streq(words[0], "tdb_lockall_unmark")) {
-                       add_op(&op, i, OP_TDB_LOCKALL_UNMARK, NULL, NULL, 0);
-               } else if (streq(words[0], "tdb_lockall_nonblock")) {
-                       add_op(&op, i, OP_TDB_LOCKALL_NONBLOCK, NULL, NULL,
-                              atoi(words[1]));
-               } else if (streq(words[0], "tdb_unlockall")) {
-                       add_op(&op, i, OP_TDB_UNLOCKALL, NULL, NULL, 0);
-               } else if (streq(words[0], "tdb_lockall_read")) {
-                       add_op(&op, i, OP_TDB_LOCKALL_READ, NULL, NULL, 0);
-               } else if (streq(words[0], "tdb_lockall_read_nonblock")) {
-                       add_op(&op, i, OP_TDB_LOCKALL_READ_NONBLOCK, NULL, NULL,
-                              atoi(words[1]));
-               } else if (streq(words[0], "tdb_unlockall_read\n")) {
-                       add_op(&op, i, OP_TDB_UNLOCKALL_READ, NULL, NULL, 0);
-               } else if (streq(words[0], "tdb_chainlock")) {
-                       add_op(&op, i, OP_TDB_CHAINLOCK, words[1], NULL, 0);
-               } else if (streq(words[0], "tdb_chainlock_nonblock")) {
-                       add_op(&op, i, OP_TDB_CHAINLOCK_NONBLOCK,
-                              words[1], NULL, atoi(words[3]));
-               } else if (streq(words[0], "tdb_chainlock_mark")) {
-                       add_op(&op, i, OP_TDB_CHAINLOCK_MARK, words[1], NULL,
-                              0);
-               } else if (streq(words[0], "tdb_chainlock_unmark")) {
-                       add_op(&op, i, OP_TDB_CHAINLOCK_UNMARK, words[1], NULL,
-                              0);
-               } else if (streq(words[0], "tdb_chainunlock")) {
-                       add_op(&op, i, OP_TDB_CHAINUNLOCK, words[1], NULL, 0);
-               } else if (streq(words[0], "tdb_chainlock_read")) {
-                       add_op(&op, i, OP_TDB_CHAINLOCK_READ, words[1],
-                              NULL, 0);
-               } else if (streq(words[0], "tdb_chainunlock_read")) {
-                       add_op(&op, i, OP_TDB_CHAINUNLOCK_READ, words[1],
-                              NULL, 0);
-               } else if (streq(words[0], "tdb_close")) {
-                       add_op(&op, i, OP_TDB_CLOSE, NULL, NULL, 0);
-               } else if (streq(words[0], "tdb_increment_seqnum_nonblock")) {
-                       add_op(&op, i, OP_TDB_INCREMENT_SEQNUM_NONBLOCK,
-                              NULL, NULL, 0);
-               } else if (streq(words[0], "tdb_fetch")) {
-                       if (streq(words[3], "ENOENT"))
-                               add_op(&op, i, OP_TDB_FETCH, words[1], NULL,
-                                      -TDB_ERR_NOEXIST);
-                       else
-                               add_op(&op, i, OP_TDB_FETCH, words[1], words[3],
-                                      0);
-               } else if (streq(words[0], "tdb_parse_record")) {
-                       if (streq(words[3], "ENOENT"))
-                               add_op(&op, i, OP_TDB_PARSE_RECORD,
-                                      words[1], NULL, -TDB_ERR_NOEXIST);
-                       else
-                               add_op(&op, i, OP_TDB_PARSE_RECORD,
-                                      words[1], NULL, atoi(words[3]));
-               } else if (streq(words[0], "tdb_exists")) {
-                       add_op(&op, i, OP_TDB_EXISTS, words[1], NULL,
-                              atoi(words[3]));
-               } else if (streq(words[0], "tdb_delete")) {
-                       add_op(&op, i, OP_TDB_DELETE, words[1], NULL,
-                              streq(words[3], "ENOENT")
-                              ? -TDB_ERR_NOEXIST : 0);
-               } else if (streq(words[0], "tdb_store")) {
-                       struct op *new;
-
-                       if (streq(words[5], "EEXIST"))
-                               new = add_op(&op, i, OP_TDB_STORE, words[2],
-                                            words[3], -TDB_ERR_EXISTS);
-                       else if (streq(words[5], "ENOENT"))
-                               new = add_op(&op, i, OP_TDB_STORE, words[2],
-                                            words[3], -TDB_ERR_NOEXIST);
-                       else
-                               new = add_op(&op, i, OP_TDB_STORE, words[2],
-                                            words[3], 0);
-                       if (streq(words[1], "insert"))
-                               new->flag = TDB_INSERT;
-                       else if (streq(words[1], "modify"))
-                               new->flag = TDB_MODIFY;
-                       else if (streq(words[1], "normal"))
-                               new->flag = 0;
-                       else
-                               errx(1, "Line %u: invalid tdb_store", i+1);
-               } else if (streq(words[0], "tdb_append")) {
-                       add_op(&op, i, OP_TDB_APPEND, words[1], words[2], 0);
-               } else if (streq(words[0], "tdb_get_seqnum")) {
-                       add_op(&op, i, OP_TDB_GET_SEQNUM, NULL, NULL,
-                              atoi(words[2]));
-               } else if (streq(words[0], "tdb_wipe_all")) {
-                       add_op(&op, i, OP_TDB_WIPE_ALL, NULL, NULL, 0);
-               } else if (streq(words[0], "tdb_transaction_start")) {
-                       add_op(&op, i, OP_TDB_TRANSACTION_START, NULL, NULL, 0);
-               } else if (streq(words[0], "tdb_transaction_cancel")) {
-                       add_op(&op, i, OP_TDB_TRANSACTION_CANCEL, NULL, NULL,
-                              0);
-               } else if (streq(words[0], "tdb_transaction_commit")) {
-                       add_op(&op, i, OP_TDB_TRANSACTION_COMMIT, NULL, NULL,
-                              0);
-               } else if (streq(words[0], "tdb_traverse_read_start")) {
-                       add_op(&op, i, OP_TDB_TRAVERSE_READ_START, NULL, NULL,
-                              0)->trav = NULL;
-               } else if (streq(words[0], "tdb_traverse_start")) {
-                       add_op(&op, i, OP_TDB_TRAVERSE_START, NULL, NULL, 0)
-                               ->trav = NULL;
-               } else if (streq(words[0], "tdb_traverse_end")) {
-                       /* = %u means traverse function terminated. */
-                       if (words[1] == NULL)
-                               add_op(&op, i, OP_TDB_TRAVERSE_END, NULL, NULL,
-                                      0);
-                       else
-                               add_op(&op, i, OP_TDB_TRAVERSE_END, NULL, NULL,
-                                      atoi(words[2]));
-                       analyze_traverse(op, i);
-               } else if (streq(words[0], "traverse")) {
-                       add_op(&op, i, OP_TDB_TRAVERSE, words[1], words[2], 0);
-               } else if (streq(words[0], "tdb_firstkey")) {
-                       if (streq(words[2], "ENOENT"))
-                               add_op(&op, i, OP_TDB_FIRSTKEY, NULL, NULL,
-                                      -TDB_ERR_NOEXIST);
-                       else
-                               add_op(&op, i, OP_TDB_FIRSTKEY, NULL, words[2],
-                                      0);
-               } else if (streq(words[0], "tdb_nextkey")) {
-                       if (streq(words[3], "ENOENT"))
-                               add_op(&op, i, OP_TDB_NEXTKEY, words[1], NULL,
-                                      -TDB_ERR_NOEXIST);
-                       else
-                               add_op(&op, i, OP_TDB_NEXTKEY,
-                                      words[1], words[3], 0);
-               } else
-                       errx(1, "Line %u: unknown op '%s'", i+1, words[0]);
+                               err(1, "Opening tdb %s", argv[1]);
+
+                       /* 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, num_ops[i]);
+                       exit(0);
+               default:
+                       break;
+               }
        }
 
-       printf("Successfully input %u lines\n", i);
+       /* Let everything settle. */
+       sleep(1);
+
        gettimeofday(&start, NULL);
-       run_ops(tdb, op, 1, i-1);
+       /* Tell them all to go!  Any write of sufficient length will do. */
+       if (write(fds[1], hashsize, i) != 1)
+               err(1, "Writing to wakeup pipe");
+
+       for (i = 0; i < argc - 2; i++) {
+               int status;
+               wait(&status);
+               if (!WIFEXITED(status))
+                       errx(1, "Child died with signal");
+               if (WEXITSTATUS(status) != 0)
+                       errx(1, "Child died with error code");
+       }
        gettimeofday(&end, NULL);
-       if (op[i-1].op != OP_TDB_CLOSE)
-               warnx("Last operation is not tdb_close: incomplete?");
-       tdb_close(tdb);
+
        end.tv_sec -= start.tv_sec;
        printf("Time replaying: %lu usec\n",
               end.tv_sec * 1000000UL + (end.tv_usec - start.tv_usec));
+       
        exit(0);
 }
diff --git a/ccan/tdb/tools/tdbdump.c b/ccan/tdb/tools/tdbdump.c
new file mode 100644 (file)
index 0000000..38f3de9
--- /dev/null
@@ -0,0 +1,120 @@
+/* 
+   Unix SMB/CIFS implementation.
+   simple tdb dump util
+   Copyright (C) Andrew Tridgell              2001
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include <ccan/tdb/tdb.h>
+#include <stdlib.h>
+#include <getopt.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <fcntl.h>
+#include <ctype.h>
+
+static void print_data(TDB_DATA d)
+{
+       unsigned char *p = (unsigned char *)d.dptr;
+       int len = d.dsize;
+       while (len--) {
+               if (isprint(*p) && !strchr("\"\\", *p)) {
+                       fputc(*p, stdout);
+               } else {
+                       printf("\\%02X", *p);
+               }
+               p++;
+       }
+}
+
+static int traverse_fn(TDB_CONTEXT *tdb, TDB_DATA key, TDB_DATA dbuf, void *state)
+{
+       printf("{\n");
+       printf("key(%d) = \"", (int)key.dsize);
+       print_data(key);
+       printf("\"\n");
+       printf("data(%d) = \"", (int)dbuf.dsize);
+       print_data(dbuf);
+       printf("\"\n");
+       printf("}\n");
+       return 0;
+}
+
+static int dump_tdb(const char *fname, const char *keyname)
+{
+       TDB_CONTEXT *tdb;
+       TDB_DATA key, value;
+       
+       tdb = tdb_open(fname, 0, 0, O_RDONLY, 0);
+       if (!tdb) {
+               printf("Failed to open %s\n", fname);
+               return 1;
+       }
+
+       if (!keyname) {
+               tdb_traverse(tdb, traverse_fn, NULL);
+       } else {
+               key.dptr = (void *)keyname;
+               key.dsize = strlen( keyname);
+               value = tdb_fetch(tdb, key);
+               if (!value.dptr) {
+                       return 1;
+               } else {
+                       print_data(value);
+                       free(value.dptr);
+               }
+       }
+
+       return 0;
+}
+
+static void usage( void)
+{
+       printf( "Usage: tdbdump [options] <filename>\n\n");
+       printf( "   -h          this help message\n");
+       printf( "   -k keyname  dumps value of keyname\n");
+}
+
+ int main(int argc, char *argv[])
+{
+       char *fname, *keyname=NULL;
+       int c;
+
+       if (argc < 2) {
+               printf("Usage: tdbdump <fname>\n");
+               exit(1);
+       }
+
+       while ((c = getopt( argc, argv, "hk:")) != -1) {
+               switch (c) {
+               case 'h':
+                       usage();
+                       exit( 0);
+               case 'k':
+                       keyname = optarg;
+                       break;
+               default:
+                       usage();
+                       exit( 1);
+               }
+       }
+
+       fname = argv[optind];
+
+       return dump_tdb(fname, keyname);
+}
index 986fbee196e8557aac9777e6d39d4e2edd83bfa1..aadc8afa3aa8e42cd7f03c1257dbe986c67625e1 100644 (file)
@@ -20,6 +20,7 @@
 #define DELETE_PROB 8
 #define STORE_PROB 4
 #define APPEND_PROB 6
+#if 0
 #define TRANSACTION_PROB 10
 #define TRANSACTION_PREPARE_PROB 2
 #define LOCKSTORE_PROB 5
@@ -27,6 +28,7 @@
 #define TRAVERSE_READ_PROB 20
 #define TRAVERSE_MOD_PROB 100
 #define TRAVERSE_ABORT_PROB 500
+#endif
 #define CULL_PROB 100
 #define KEYLEN 3
 #define DATALEN 100
index de653cd0e3f1ffcd7f38f59989ddb24380b8e07e..83a3ed85ab947d4f8c29b4c9ec2d62adbb803488 100644 (file)
@@ -457,7 +457,7 @@ int tdb_transaction_cancel_internal(struct tdb_context *tdb)
 */
 int tdb_transaction_start(struct tdb_context *tdb)
 {
-       tdb_trace(tdb, "tdb_transaction_start\n");
+       tdb_trace(tdb, "tdb_transaction_start");
 
        /* some sanity checks */
        if (tdb->read_only || (tdb->flags & TDB_INTERNAL) || tdb->traverse_read) {
@@ -566,7 +566,7 @@ fail:
 */
 int tdb_transaction_cancel(struct tdb_context *tdb)
 {      
-       tdb_trace(tdb, "tdb_transaction_cancel\n");
+       tdb_trace(tdb, "tdb_transaction_cancel");
        return tdb_transaction_cancel_internal(tdb);
 }
 /*
@@ -851,7 +851,7 @@ int tdb_transaction_commit(struct tdb_context *tdb)
        uint32_t zero = 0;
        int i;
 
-       tdb_trace(tdb, "tdb_transaction_commit\n");
+       tdb_trace(tdb, "tdb_transaction_commit");
        if (tdb->transaction == NULL) {
                TDB_LOG((tdb, TDB_DEBUG_ERROR, "tdb_transaction_commit: no transaction\n"));
                return -1;
index 6397930b469da5385663cee6987b2568af5d0a03..3159b014a22283f71ebbdb5978d5a7322839805a 100644 (file)
@@ -169,10 +169,7 @@ static int tdb_traverse_internal(struct tdb_context *tdb,
                dbuf.dptr = key.dptr + rec.key_len;
                dbuf.dsize = rec.data_len;
 
-               tdb_trace(tdb, "traverse ");
-               tdb_trace_record(tdb, key);
-               tdb_trace_record(tdb, dbuf);
-               tdb_trace(tdb, "\n");
+               tdb_trace_1rec_retrec(tdb, "traverse", key, dbuf);
 
                /* Drop chain lock, call out */
                if (tdb_unlock(tdb, tl->hash, tl->lock_rw) != 0) {
@@ -182,7 +179,7 @@ static int tdb_traverse_internal(struct tdb_context *tdb,
                }
                if (fn && fn(tdb, key, dbuf, private_data)) {
                        /* They want us to terminate traversal */
-                       tdb_trace(tdb, "tdb_traverse_end = %i\n", count);
+                       tdb_trace_ret(tdb, "tdb_traverse_end", count);
                        ret = count;
                        if (tdb_unlock_record(tdb, tl->off) != 0) {
                                TDB_LOG((tdb, TDB_DEBUG_FATAL, "tdb_traverse: unlock_record failed!\n"));;
@@ -193,7 +190,7 @@ static int tdb_traverse_internal(struct tdb_context *tdb,
                }
                SAFE_FREE(key.dptr);
        }
-       tdb_trace(tdb, "tdb_traverse_end\n");
+       tdb_trace(tdb, "tdb_traverse_end");
 out:
        tdb->travlocks.next = tl->next;
        if (ret < 0)
@@ -219,7 +216,7 @@ int tdb_traverse_read(struct tdb_context *tdb,
        }
 
        tdb->traverse_read++;
-       tdb_trace(tdb, "tdb_traverse_read_start\n");
+       tdb_trace(tdb, "tdb_traverse_read_start");
        ret = tdb_traverse_internal(tdb, fn, private_data, &tl);
        tdb->traverse_read--;
 
@@ -253,7 +250,7 @@ int tdb_traverse(struct tdb_context *tdb,
        }
 
        tdb->traverse_write++;
-       tdb_trace(tdb, "tdb_traverse_start\n");
+       tdb_trace(tdb, "tdb_traverse_start");
        ret = tdb_traverse_internal(tdb, fn, private_data, &tl);
        tdb->traverse_write--;
 
@@ -279,16 +276,14 @@ TDB_DATA tdb_firstkey(struct tdb_context *tdb)
 
        /* Grab first record: locks chain and returned record. */
        if (tdb_next_lock(tdb, &tdb->travlocks, &rec) <= 0) {
-               tdb_trace(tdb, "tdb_firstkey = ENOENT\n");
+               tdb_trace_retrec(tdb, "tdb_firstkey", tdb_null);
                return tdb_null;
        }
        /* now read the key */
        key.dsize = rec.key_len;
        key.dptr =tdb_alloc_read(tdb,tdb->travlocks.off+sizeof(rec),key.dsize);
 
-       tdb_trace(tdb, "tdb_firstkey = ");
-       tdb_trace_record(tdb, key);
-       tdb_trace(tdb, "\n");
+       tdb_trace_retrec(tdb, "tdb_firstkey", key);
 
        /* Unlock the hash chain of the record we just read. */
        if (tdb_unlock(tdb, tdb->travlocks.hash, tdb->travlocks.lock_rw) != 0)
@@ -314,9 +309,8 @@ TDB_DATA tdb_nextkey(struct tdb_context *tdb, TDB_DATA oldkey)
                    || memcmp(k, oldkey.dptr, oldkey.dsize) != 0) {
                        /* No, it wasn't: unlock it and start from scratch */
                        if (tdb_unlock_record(tdb, tdb->travlocks.off) != 0) {
-                               tdb_trace(tdb, "tdb_nextkey ");
-                               tdb_trace_record(tdb, oldkey);
-                               tdb_trace(tdb, "= ENOENT\n");
+                               tdb_trace_1rec_retrec(tdb, "tdb_nextkey",
+                                                     oldkey, tdb_null);
                                SAFE_FREE(k);
                                return tdb_null;
                        }
@@ -334,9 +328,7 @@ TDB_DATA tdb_nextkey(struct tdb_context *tdb, TDB_DATA oldkey)
                /* No previous element: do normal find, and lock record */
                tdb->travlocks.off = tdb_find_lock_hash(tdb, oldkey, tdb->hash_fn(&oldkey), tdb->travlocks.lock_rw, &rec);
                if (!tdb->travlocks.off) {
-                       tdb_trace(tdb, "tdb_nextkey ");
-                       tdb_trace_record(tdb, oldkey);
-                       tdb_trace(tdb, "= ENOENT\n");
+                       tdb_trace_1rec_retrec(tdb, "tdb_nextkey", oldkey, tdb_null);
                        return tdb_null;
                }
                tdb->travlocks.hash = BUCKET(rec.full_hash);
@@ -360,11 +352,7 @@ TDB_DATA tdb_nextkey(struct tdb_context *tdb, TDB_DATA oldkey)
        /* Unlock the chain of old record */
        if (tdb_unlock(tdb, BUCKET(oldhash), tdb->travlocks.lock_rw) != 0)
                TDB_LOG((tdb, TDB_DEBUG_FATAL, "tdb_nextkey: WARNING tdb_unlock failed!\n"));
-       tdb_trace(tdb, "tdb_nextkey ");
-       tdb_trace_record(tdb, oldkey);
-       tdb_trace(tdb, "= ");
-       tdb_trace_record(tdb, key);
-       tdb_trace(tdb, "\n");
+       tdb_trace_1rec_retrec(tdb, "tdb_nextkey", oldkey, key);
        return key;
 }