Browse Source

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

Rusty Russell 16 years ago
parent
commit
25db0fb490
2 changed files with 1 additions and 7 deletions
  1. 0 2
      ccan/tdb/tdb.c
  2. 1 5
      ccan/tdb/tools/replay_trace.c

+ 0 - 2
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
 	/* we ignore errors from this, as we have no sane way of
 	   dealing with them.
 	   dealing with them.
 	*/
 	*/

+ 1 - 5
ccan/tdb/tools/replay_trace.c

@@ -98,7 +98,6 @@ enum op_type {
 	OP_TDB_CHAINUNLOCK,
 	OP_TDB_CHAINUNLOCK,
 	OP_TDB_CHAINLOCK_READ,
 	OP_TDB_CHAINLOCK_READ,
 	OP_TDB_CHAINUNLOCK_READ,
 	OP_TDB_CHAINUNLOCK_READ,
-	OP_TDB_INCREMENT_SEQNUM_NONBLOCK,
 	OP_TDB_PARSE_RECORD,
 	OP_TDB_PARSE_RECORD,
 	OP_TDB_EXISTS,
 	OP_TDB_EXISTS,
 	OP_TDB_STORE,
 	OP_TDB_STORE,
@@ -593,9 +592,6 @@ unsigned run_ops(struct tdb_context *tdb,
 		case OP_TDB_CHAINUNLOCK_READ:
 		case OP_TDB_CHAINUNLOCK_READ:
 			try(tdb_chainunlock_read(tdb, op[i].key), op[i].ret);
 			try(tdb_chainunlock_read(tdb, op[i].key), op[i].ret);
 			break;
 			break;
-		case OP_TDB_INCREMENT_SEQNUM_NONBLOCK:
-			tdb_increment_seqnum_nonblock(tdb);
-			break;
 		case OP_TDB_PARSE_RECORD:
 		case OP_TDB_PARSE_RECORD:
 			try(tdb_parse_record(tdb, op[i].key, get_len, NULL),
 			try(tdb_parse_record(tdb, op[i].key, get_len, NULL),
 			    op[i].ret);
 			    op[i].ret);
@@ -932,7 +928,7 @@ int main(int argc, char *argv[])
 
 
 	gettimeofday(&start, NULL);
 	gettimeofday(&start, NULL);
 	/* Tell them all to go!  Any write of sufficient length will do. */
 	/* 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");
 		err(1, "Writing to wakeup pipe");
 
 
 	for (i = 0; i < argc - 2; i++) {
 	for (i = 0; i < argc - 2; i++) {