Create handles and default to console reported for metrics
diff --git a/apps/foo/src/main/java/org/onlab/onos/foo/NettyEchoHandler.java b/apps/foo/src/main/java/org/onlab/onos/foo/NettyEchoHandler.java
new file mode 100644
index 0000000..1049a6d
--- /dev/null
+++ b/apps/foo/src/main/java/org/onlab/onos/foo/NettyEchoHandler.java
@@ -0,0 +1,23 @@
+package org.onlab.onos.foo;
+
+import java.io.IOException;
+
+import org.onlab.netty.Message;
+import org.onlab.netty.MessageHandler;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * Message handler that echos the message back to the sender.
+ */
+public class NettyEchoHandler implements MessageHandler {
+
+ private final Logger log = LoggerFactory.getLogger(getClass());
+
+ @Override
+ public void handle(Message message) throws IOException {
+ //log.info("Received message. Echoing it back to the sender.");
+ message.respond(message.payload());
+ }
+}
diff --git a/apps/foo/src/main/java/org/onlab/onos/foo/NettyLoggingHandler.java b/apps/foo/src/main/java/org/onlab/onos/foo/NettyLoggingHandler.java
new file mode 100644
index 0000000..bc10c82
--- /dev/null
+++ b/apps/foo/src/main/java/org/onlab/onos/foo/NettyLoggingHandler.java
@@ -0,0 +1,19 @@
+package org.onlab.onos.foo;
+
+import org.onlab.netty.Message;
+import org.onlab.netty.MessageHandler;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * A MessageHandler that simply logs the information.
+ */
+public class NettyLoggingHandler implements MessageHandler {
+
+ private final Logger log = LoggerFactory.getLogger(getClass());
+
+ @Override
+ public void handle(Message message) {
+ log.info("Received message. Payload has {} bytes", message.payload().length);
+ }
+}
diff --git a/apps/foo/src/main/java/org/onlab/onos/foo/SimpleNettyClient.java b/apps/foo/src/main/java/org/onlab/onos/foo/SimpleNettyClient.java
index 8f94ec1..caf3e08 100644
--- a/apps/foo/src/main/java/org/onlab/onos/foo/SimpleNettyClient.java
+++ b/apps/foo/src/main/java/org/onlab/onos/foo/SimpleNettyClient.java
@@ -2,7 +2,6 @@
import java.io.IOException;
import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import org.onlab.metrics.MetricsComponent;
@@ -35,28 +34,37 @@
MetricsManager metrics = new MetricsManager();
messaging.activate();
metrics.activate();
- MetricsFeature feature = new MetricsFeature("timers");
+ MetricsFeature feature = new MetricsFeature("latency");
MetricsComponent component = metrics.registerComponent("NettyMessaging");
Timer sendAsyncTimer = metrics.createTimer(component, feature, "AsyncSender");
+
final int warmup = 100;
for (int i = 0; i < warmup; i++) {
+ messaging.sendAsync(new Endpoint("localhost", 8081), "simple", "Hello World".getBytes());
+ Response response = messaging
+ .sendAndReceive(new Endpoint("localhost", 8081), "echo",
+ "Hello World".getBytes());
+ }
+
+ final int iterations = 10000;
+ for (int i = 0; i < iterations; i++) {
Timer.Context context = sendAsyncTimer.time();
- messaging.sendAsync(new Endpoint("localhost", 8080), "simple", "Hello World".getBytes());
+ messaging.sendAsync(new Endpoint("localhost", 8081), "simple", "Hello World".getBytes());
context.stop();
}
metrics.registerMetric(component, feature, "AsyncTimer", sendAsyncTimer);
Timer sendAndReceiveTimer = metrics.createTimer(component, feature, "SendAndReceive");
- final int iterations = 1000000;
+
for (int i = 0; i < iterations; i++) {
Timer.Context context = sendAndReceiveTimer.time();
Response response = messaging
- .sendAndReceive(new Endpoint("localhost", 8080), "echo",
+ .sendAndReceive(new Endpoint("localhost", 8081), "echo",
"Hello World".getBytes());
- System.out.println("Got back:" + new String(response.get(2, TimeUnit.SECONDS)));
+ // System.out.println("Got back:" + new String(response.get(2, TimeUnit.SECONDS)));
context.stop();
}
- metrics.registerMetric(component, feature, "AsyncTimer", sendAndReceiveTimer);
+ metrics.registerMetric(component, feature, "PingPong", sendAndReceiveTimer);
}
public static class TestNettyMessagingService extends NettyMessagingService {
diff --git a/apps/foo/src/main/java/org/onlab/onos/foo/SimpleNettyServer.java b/apps/foo/src/main/java/org/onlab/onos/foo/SimpleNettyServer.java
index 25ac59b..c0eb014 100644
--- a/apps/foo/src/main/java/org/onlab/onos/foo/SimpleNettyServer.java
+++ b/apps/foo/src/main/java/org/onlab/onos/foo/SimpleNettyServer.java
@@ -1,6 +1,5 @@
package org.onlab.onos.foo;
-import org.onlab.netty.EchoHandler;
import org.onlab.netty.NettyMessagingService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -19,10 +18,10 @@
}
public static void startStandalone(String[] args) throws Exception {
- NettyMessagingService server = new NettyMessagingService(8080);
+ NettyMessagingService server = new NettyMessagingService(8081);
server.activate();
- server.registerHandler("simple", new org.onlab.netty.LoggingHandler());
- server.registerHandler("echo", new EchoHandler());
+ server.registerHandler("simple", new NettyLoggingHandler());
+ server.registerHandler("echo", new NettyEchoHandler());
}
}