Fix last minute warning "fix" in replay_trace.c, remove seqnum inc tracing.

diff --git a/ccan/tdb/tdb.c b/ccan/tdb/tdb.c
index 50ff24a6e6ca4a44ca84a9b97c7ae3b37d440474..3acf05b96e15fdebc4ef893139a477907d293a30 100644 (file)
--- a/ccan/tdb/tdb.c
+++ b/ccan/tdb/tdb.c
@@ -41,8 +41,6 @@ void tdb_increment_seqnum_nonblock(struct tdb_context *tdb)
                return;
        }
 
                return;
        }
 

-       tdb_trace(tdb, "tdb_increment_seqnum_nonblock");
-

        /* we ignore errors from this, as we have no sane way of
           dealing with them.
        */
        /* we ignore errors from this, as we have no sane way of
           dealing with them.
        */

diff --git a/ccan/tdb/tools/replay_trace.c b/ccan/tdb/tools/replay_trace.c
index f697a13787995395df869c2c742c46857ce5f13e..10f9ebf2c064a98a124d359049449790417608b7 100644 (file)
--- a/ccan/tdb/tools/replay_trace.c
+++ b/ccan/tdb/tools/replay_trace.c
@@ -98,7 +98,6 @@ enum op_type {
        OP_TDB_CHAINUNLOCK,
        OP_TDB_CHAINLOCK_READ,
        OP_TDB_CHAINUNLOCK_READ,
        OP_TDB_CHAINUNLOCK,
        OP_TDB_CHAINLOCK_READ,
        OP_TDB_CHAINUNLOCK_READ,

-       OP_TDB_INCREMENT_SEQNUM_NONBLOCK,

        OP_TDB_PARSE_RECORD,
        OP_TDB_EXISTS,
        OP_TDB_STORE,
        OP_TDB_PARSE_RECORD,
        OP_TDB_EXISTS,
        OP_TDB_STORE,


@@ -593,9 +592,6 @@ unsigned run_ops(struct tdb_context *tdb,
                case OP_TDB_CHAINUNLOCK_READ:
                        try(tdb_chainunlock_read(tdb, op[i].key), op[i].ret);
                        break;
                case OP_TDB_CHAINUNLOCK_READ:
                        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].ret);
                case OP_TDB_PARSE_RECORD:
                        try(tdb_parse_record(tdb, op[i].key, get_len, NULL),
                            op[i].ret);


@@ -932,7 +928,7 @@ int main(int argc, char *argv[])
 
        gettimeofday(&start, NULL);
        /* Tell them all to go!  Any write of sufficient length will do. */
 
        gettimeofday(&start, NULL);
        /* Tell them all to go!  Any write of sufficient length will do. */

-       if (write(fds[1], hashsize, i) != 1)
+       if (write(fds[1], hashsize, i) != i)

                err(1, "Writing to wakeup pipe");
 
        for (i = 0; i < argc - 2; i++) {
                err(1, "Writing to wakeup pipe");
 
        for (i = 0; i < argc - 2; i++) {