You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by el...@apache.org on 2013/03/23 11:05:03 UTC
[2/3] git commit: Cleaned the client and server code,
removing the System.out cals and commented lines
Cleaned the client and server code, removing the System.out cals and
commented lines
Project: http://git-wip-us.apache.org/repos/asf/mina/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina/commit/a61d0e70
Tree: http://git-wip-us.apache.org/repos/asf/mina/tree/a61d0e70
Diff: http://git-wip-us.apache.org/repos/asf/mina/diff/a61d0e70
Branch: refs/heads/trunk
Commit: a61d0e700fb4816ba80352c9d3b38ed8e7a6a980
Parents: a63ec81
Author: Emmanuel Lécharny <el...@apache.org>
Authored: Sat Mar 23 10:59:50 2013 +0100
Committer: Emmanuel Lécharny <el...@apache.org>
Committed: Sat Mar 23 10:59:50 2013 +0100
----------------------------------------------------------------------
.../mina/core/nio/tcp/Mina3TcpBenchmarkClient.java | 7 -------
.../mina/core/nio/tcp/Mina3TcpBenchmarkServer.java | 3 ---
.../mina/core/nio/udp/Mina3UdpBenchmarkClient.java | 7 -------
.../mina/core/nio/udp/Mina3UdpBenchmarkServer.java | 11 +++++------
.../core/nio/udp/Netty3UdpBenchmarkClient.java | 1 +
5 files changed, 6 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina/blob/a61d0e70/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 98fa5bb..26eab19 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
@@ -52,23 +52,17 @@ public class Mina3TcpBenchmarkClient implements BenchmarkClient {
}
public void sessionOpened(IoSession session) {
- //System.out.println("Client session opened");
sendMessage(session, data);
}
public void messageReceived(IoSession session, Object message) {
- //System.out.println("Client message received : " + message);
if (message instanceof ByteBuffer) {
ByteBuffer buffer = (ByteBuffer) message;
- //System.out.println("length=" + buffer.remaining());
for (int i = 0; i < buffer.remaining(); ++i) {
counter.countDown();
long count = counter.getCount();
if (count > 0) {
sendMessage(session, data);
- if (count % 100000 == 0) {
- System.out.println("Received " + count);
- }
}
}
}
@@ -88,7 +82,6 @@ public class Mina3TcpBenchmarkClient implements BenchmarkClient {
@Override
public void messageSent(IoSession session, Object message) {
- //System.out.println("Client message sent : " + message);
}
@Override
http://git-wip-us.apache.org/repos/asf/mina/blob/a61d0e70/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 4443a00..148fc77 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
@@ -64,12 +64,10 @@ public class Mina3TcpBenchmarkServer implements BenchmarkServer {
tcpServer.getSessionConfig().setTcpNoDelay(true);
tcpServer.setIoHandler(new IoHandler() {
public void sessionOpened(IoSession session) {
- //System.out.println("Server session opened");
session.setAttribute(STATE_ATTRIBUTE, State.WAIT_FOR_FIRST_BYTE_LENGTH);
}
public void messageReceived(IoSession session, Object message) {
- //System.out.println("Server Message received : " + message);
if (message instanceof ByteBuffer) {
ByteBuffer buffer = (ByteBuffer) message;
@@ -134,7 +132,6 @@ public class Mina3TcpBenchmarkServer implements BenchmarkServer {
@Override
public void messageSent(IoSession session, Object message) {
- //System.out.println("Server message sent :" + message);
}
@Override
http://git-wip-us.apache.org/repos/asf/mina/blob/a61d0e70/benchmarks/src/test/java/org/apache/mina/core/nio/udp/Mina3UdpBenchmarkClient.java
----------------------------------------------------------------------
diff --git a/benchmarks/src/test/java/org/apache/mina/core/nio/udp/Mina3UdpBenchmarkClient.java b/benchmarks/src/test/java/org/apache/mina/core/nio/udp/Mina3UdpBenchmarkClient.java
index 562c087..71696ec 100755
--- a/benchmarks/src/test/java/org/apache/mina/core/nio/udp/Mina3UdpBenchmarkClient.java
+++ b/benchmarks/src/test/java/org/apache/mina/core/nio/udp/Mina3UdpBenchmarkClient.java
@@ -52,23 +52,17 @@ public class Mina3UdpBenchmarkClient implements BenchmarkClient {
}
public void sessionOpened(IoSession session) {
- //System.out.println("Client session opened");
sendMessage(session, data);
}
public void messageReceived(IoSession session, Object message) {
- //System.out.println("Client message received : " + message);
if (message instanceof ByteBuffer) {
ByteBuffer buffer = (ByteBuffer) message;
- //System.out.println("length=" + buffer.remaining());
for (int i = 0; i < buffer.remaining(); ++i) {
counter.countDown();
long count = counter.getCount();
if (count > 0) {
sendMessage(session, data);
- if (count % 100000 == 0) {
- System.out.println("Received " + count);
- }
}
}
}
@@ -88,7 +82,6 @@ public class Mina3UdpBenchmarkClient implements BenchmarkClient {
@Override
public void messageSent(IoSession session, Object message) {
- //System.out.println("Client message sent : " + message);
}
@Override
http://git-wip-us.apache.org/repos/asf/mina/blob/a61d0e70/benchmarks/src/test/java/org/apache/mina/core/nio/udp/Mina3UdpBenchmarkServer.java
----------------------------------------------------------------------
diff --git a/benchmarks/src/test/java/org/apache/mina/core/nio/udp/Mina3UdpBenchmarkServer.java b/benchmarks/src/test/java/org/apache/mina/core/nio/udp/Mina3UdpBenchmarkServer.java
index 7ed7cfe..3bf9e29 100755
--- a/benchmarks/src/test/java/org/apache/mina/core/nio/udp/Mina3UdpBenchmarkServer.java
+++ b/benchmarks/src/test/java/org/apache/mina/core/nio/udp/Mina3UdpBenchmarkServer.java
@@ -30,6 +30,8 @@ import org.apache.mina.api.IoSession;
import org.apache.mina.core.BenchmarkServer;
import org.apache.mina.session.AttributeKey;
import org.apache.mina.transport.nio.NioUdpServer;
+import org.apache.mina.transport.udp.DefaultUdpSessionConfig;
+import org.apache.mina.transport.udp.UdpSessionConfig;
/**
* @author <a href="http://mina.apache.org">Apache MINA Project</a>
@@ -59,14 +61,11 @@ public class Mina3UdpBenchmarkServer implements BenchmarkServer {
* {@inheritDoc}
*/
public void start(int port) throws IOException {
- udpServer = new NioUdpServer();
+ UdpSessionConfig config = new DefaultUdpSessionConfig();
+ config.setReadBufferSize(65536);
+ udpServer = new NioUdpServer(config);
udpServer.setIoHandler(new IoHandler() {
- public void sessionCreated(IoSession session) {
- System.out.println("Session created...");
- }
-
public void sessionOpened(IoSession session) {
- //System.out.println("Server session opened");
session.setAttribute(STATE_ATTRIBUTE, State.WAIT_FOR_FIRST_BYTE_LENGTH);
}
http://git-wip-us.apache.org/repos/asf/mina/blob/a61d0e70/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 14177c6..33214f3 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
@@ -56,6 +56,7 @@ public class Netty3UdpBenchmarkClient implements BenchmarkClient {
public void start(final int port, final CountDownLatch counter, final byte[] data) throws IOException {
factory = new NioDatagramChannelFactory();
ConnectionlessBootstrap bootstrap = new ConnectionlessBootstrap(factory);
+ bootstrap.setOption("sendBufferSize", 65536);
bootstrap.setPipelineFactory(new ChannelPipelineFactory() {
public ChannelPipeline getPipeline() throws Exception {
return Channels.pipeline(new SimpleChannelUpstreamHandler() {