Working on IO loop tests commands.
diff --git a/utils/nio/src/test/java/org/onlab/nio/IOLoopTestClient.java b/utils/nio/src/test/java/org/onlab/nio/IOLoopTestClient.java
index dba0b18..bdcc97a 100644
--- a/utils/nio/src/test/java/org/onlab/nio/IOLoopTestClient.java
+++ b/utils/nio/src/test/java/org/onlab/nio/IOLoopTestClient.java
@@ -24,7 +24,6 @@
import java.util.concurrent.TimeoutException;
import static java.lang.String.format;
-import static java.lang.System.currentTimeMillis;
import static java.lang.System.nanoTime;
import static java.lang.System.out;
import static org.onlab.nio.IOLoopTestServer.PORT;
@@ -80,7 +79,7 @@
int wc = args.length > 1 ? Integer.parseInt(args[1]) : 6;
int mc = args.length > 2 ? Integer.parseInt(args[2]) : 50 * 1000000;
int ml = args.length > 3 ? Integer.parseInt(args[3]) : 128;
- int to = args.length > 4 ? Integer.parseInt(args[4]) : 30;
+ int to = args.length > 4 ? Integer.parseInt(args[4]) : 60;
log.info("Setting up client with {} workers sending {} {}-byte messages to {} server... ",
wc, mc, ml, ip);
@@ -184,7 +183,7 @@
*/
public void report() {
DecimalFormat f = new DecimalFormat("#,##0");
- out.println(format("Client: %s messages; %s bytes; %s mps; %s Mbs; %s ns latency",
+ out.println(format("Client: %s messages; %s bytes; %s mps; %s MBs; %s ns latency",
f.format(messages.total()), f.format(bytes.total()),
f.format(messages.throughput()),
f.format(bytes.throughput() / (1024 * msgLength)),
@@ -213,16 +212,8 @@
@Override
protected synchronized void removeStream(MessageStream<TestMessage> stream) {
super.removeStream(stream);
-
messages.add(stream.messagesIn().total());
bytes.add(stream.bytesIn().total());
-
-// out.println(format("Disconnected client; inbound %s mps, %s Mbps; outbound %s mps, %s Mbps",
-// FORMAT.format(stream.messagesIn().throughput()),
-// FORMAT.format(stream.bytesIn().throughput() / (1024 * msgLength)),
-// FORMAT.format(stream.messagesOut().throughput()),
-// FORMAT.format(stream.bytesOut().throughput() / (1024 * msgLength))));
-
stream.messagesOut().reset();
stream.bytesOut().reset();
}