Updated Branches: refs/heads/trunk a064a8a8e -> 3cd4f805e
o Fixed the Netty3 UDP benchmark (at least for messages below 1024bytes : for bigger messages, the bench is not working, as it seems that Netty3 does not support message bigger...) o Added some headers Project: http://git-wip-us.apache.org/repos/asf/mina/repo Commit: http://git-wip-us.apache.org/repos/asf/mina/commit/3cd4f805 Tree: http://git-wip-us.apache.org/repos/asf/mina/tree/3cd4f805 Diff: http://git-wip-us.apache.org/repos/asf/mina/diff/3cd4f805 Branch: refs/heads/trunk Commit: 3cd4f805e18d4c7b0eb87af720b9ee963c40bcd8 Parents: a064a8a Author: Emmanuel Lécharny <[email protected]> Authored: Mon May 27 23:07:23 2013 +0200 Committer: Emmanuel Lécharny <[email protected]> Committed: Mon May 27 23:07:23 2013 +0200 ---------------------------------------------------------------------- .../mina/core/nio/tcp/Mina3TcpBenchmarkClient.java | 2 ++ .../mina/core/nio/tcp/Mina3TcpBenchmarkServer.java | 1 + .../core/nio/tcp/Netty3TcpBenchmarkClient.java | 1 + .../core/nio/tcp/Netty3TcpBenchmarkServer.java | 1 + .../core/nio/udp/Netty3UdpBenchmarkClient.java | 1 + .../core/nio/udp/Netty3UdpBenchmarkServer.java | 5 ++++- 6 files changed, 10 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mina/blob/3cd4f805/benchmarks/src/test/java/org/apache/mina/core/nio/tcp/Mina3TcpBenchmarkClient.java ---------------------------------------------------------------------- diff --git a/benchmarks/src/test/java/org/apache/mina/core/nio/tcp/Mina3TcpBenchmarkClient.java b/benchmarks/src/test/java/org/apache/mina/core/nio/tcp/Mina3TcpBenchmarkClient.java index 413d3f9..44ceeb7 100755 --- a/benchmarks/src/test/java/org/apache/mina/core/nio/tcp/Mina3TcpBenchmarkClient.java +++ b/benchmarks/src/test/java/org/apache/mina/core/nio/tcp/Mina3TcpBenchmarkClient.java @@ -32,6 +32,7 @@ import org.apache.mina.core.BenchmarkClient; import org.apache.mina.transport.nio.NioTcpClient; /** + * A MINA 3 TCP CLient. * @author <a href="http://mina.apache.org";>Apache MINA Project</a> */ public class Mina3TcpBenchmarkClient implements BenchmarkClient { @@ -58,6 +59,7 @@ public class Mina3TcpBenchmarkClient implements BenchmarkClient { public void messageReceived(IoSession session, Object message) { if (message instanceof ByteBuffer) { ByteBuffer buffer = (ByteBuffer) message; + for (int i = 0; i < buffer.remaining(); ++i) { counter.countDown(); long count = counter.getCount(); http://git-wip-us.apache.org/repos/asf/mina/blob/3cd4f805/benchmarks/src/test/java/org/apache/mina/core/nio/tcp/Mina3TcpBenchmarkServer.java ---------------------------------------------------------------------- diff --git a/benchmarks/src/test/java/org/apache/mina/core/nio/tcp/Mina3TcpBenchmarkServer.java b/benchmarks/src/test/java/org/apache/mina/core/nio/tcp/Mina3TcpBenchmarkServer.java index 9bf550b..7ace829 100755 --- a/benchmarks/src/test/java/org/apache/mina/core/nio/tcp/Mina3TcpBenchmarkServer.java +++ b/benchmarks/src/test/java/org/apache/mina/core/nio/tcp/Mina3TcpBenchmarkServer.java @@ -32,6 +32,7 @@ import org.apache.mina.session.AttributeKey; import org.apache.mina.transport.nio.NioTcpServer; /** + * A MINA 3 TCP Server. * @author <a href="http://mina.apache.org";>Apache MINA Project</a> */ public class Mina3TcpBenchmarkServer implements BenchmarkServer { http://git-wip-us.apache.org/repos/asf/mina/blob/3cd4f805/benchmarks/src/test/java/org/apache/mina/core/nio/tcp/Netty3TcpBenchmarkClient.java ---------------------------------------------------------------------- diff --git a/benchmarks/src/test/java/org/apache/mina/core/nio/tcp/Netty3TcpBenchmarkClient.java b/benchmarks/src/test/java/org/apache/mina/core/nio/tcp/Netty3TcpBenchmarkClient.java index cd712be..20ca67f 100644 --- a/benchmarks/src/test/java/org/apache/mina/core/nio/tcp/Netty3TcpBenchmarkClient.java +++ b/benchmarks/src/test/java/org/apache/mina/core/nio/tcp/Netty3TcpBenchmarkClient.java @@ -38,6 +38,7 @@ import org.jboss.netty.channel.SimpleChannelUpstreamHandler; import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory; /** + * A Netty 3 TCP CLient. * @author <a href="http://mina.apache.org";>Apache MINA Project</a> */ public class Netty3TcpBenchmarkClient implements BenchmarkClient { http://git-wip-us.apache.org/repos/asf/mina/blob/3cd4f805/benchmarks/src/test/java/org/apache/mina/core/nio/tcp/Netty3TcpBenchmarkServer.java ---------------------------------------------------------------------- diff --git a/benchmarks/src/test/java/org/apache/mina/core/nio/tcp/Netty3TcpBenchmarkServer.java b/benchmarks/src/test/java/org/apache/mina/core/nio/tcp/Netty3TcpBenchmarkServer.java index f529ff4..0f6631e 100644 --- a/benchmarks/src/test/java/org/apache/mina/core/nio/tcp/Netty3TcpBenchmarkServer.java +++ b/benchmarks/src/test/java/org/apache/mina/core/nio/tcp/Netty3TcpBenchmarkServer.java @@ -43,6 +43,7 @@ import org.jboss.netty.channel.group.DefaultChannelGroup; import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory; /** + * A Netty 3 TCP Server. * @author <a href="http://mina.apache.org";>Apache MINA Project</a> */ public class Netty3TcpBenchmarkServer implements BenchmarkServer { http://git-wip-us.apache.org/repos/asf/mina/blob/3cd4f805/benchmarks/src/test/java/org/apache/mina/core/nio/udp/Netty3UdpBenchmarkClient.java ---------------------------------------------------------------------- diff --git a/benchmarks/src/test/java/org/apache/mina/core/nio/udp/Netty3UdpBenchmarkClient.java b/benchmarks/src/test/java/org/apache/mina/core/nio/udp/Netty3UdpBenchmarkClient.java index 5881679..0cbc0d6 100644 --- a/benchmarks/src/test/java/org/apache/mina/core/nio/udp/Netty3UdpBenchmarkClient.java +++ b/benchmarks/src/test/java/org/apache/mina/core/nio/udp/Netty3UdpBenchmarkClient.java @@ -98,6 +98,7 @@ public class Netty3UdpBenchmarkClient implements BenchmarkClient { * {@inheritedDoc} */ public void stop() throws IOException { + factory.shutdown(); factory.releaseExternalResources(); } } http://git-wip-us.apache.org/repos/asf/mina/blob/3cd4f805/benchmarks/src/test/java/org/apache/mina/core/nio/udp/Netty3UdpBenchmarkServer.java ---------------------------------------------------------------------- diff --git a/benchmarks/src/test/java/org/apache/mina/core/nio/udp/Netty3UdpBenchmarkServer.java b/benchmarks/src/test/java/org/apache/mina/core/nio/udp/Netty3UdpBenchmarkServer.java index 3b04c96..155da87 100644 --- a/benchmarks/src/test/java/org/apache/mina/core/nio/udp/Netty3UdpBenchmarkServer.java +++ b/benchmarks/src/test/java/org/apache/mina/core/nio/udp/Netty3UdpBenchmarkServer.java @@ -21,6 +21,7 @@ package org.apache.mina.core.nio.udp; import java.io.IOException; import java.net.InetSocketAddress; +import java.net.SocketAddress; import java.util.HashMap; import java.util.Map; @@ -151,7 +152,8 @@ public class Netty3UdpBenchmarkServer implements BenchmarkServer { buffer.skipBytes(remaining); } else { buffer.skipBytes(length); - ctx.getChannel().write(ACK.slice()); + SocketAddress remoteAddress = e.getRemoteAddress(); + ctx.getChannel().write(ACK.slice(), remoteAddress); state = State.WAIT_FOR_FIRST_BYTE_LENGTH; length = 0; } @@ -182,6 +184,7 @@ public class Netty3UdpBenchmarkServer implements BenchmarkServer { */ public void stop() throws IOException { allChannels.disconnect().awaitUninterruptibly(); + factory.shutdown(); factory.releaseExternalResources(); } }
