o Added a bio package for BIO based benchlarks
o Added a BioClientBioServer benchmark
o Added some headers
diff --git a/benchmarks/src/test/java/org/apache/mina/core/BenchmarkClientFactory.java b/benchmarks/src/test/java/org/apache/mina/core/BenchmarkClientFactory.java
index 7af63c5..1bfc492 100755
--- a/benchmarks/src/test/java/org/apache/mina/core/BenchmarkClientFactory.java
+++ b/benchmarks/src/test/java/org/apache/mina/core/BenchmarkClientFactory.java
@@ -19,9 +19,9 @@
*/
package org.apache.mina.core;
+import org.apache.mina.core.bio.udp.BioUdpBenchmarkClient;
import org.apache.mina.core.nio.tcp.Mina3TcpBenchmarkClient;
import org.apache.mina.core.nio.tcp.Netty3TcpBenchmarkClient;
-import org.apache.mina.core.nio.udp.BioUdpBenchmarkClient;
import org.apache.mina.core.nio.udp.Mina3UdpBenchmarkClient;
import org.apache.mina.core.nio.udp.Netty3UdpBenchmarkClient;
diff --git a/benchmarks/src/test/java/org/apache/mina/core/BenchmarkServerFactory.java b/benchmarks/src/test/java/org/apache/mina/core/BenchmarkServerFactory.java
index e2a7015..21eeb0f 100755
--- a/benchmarks/src/test/java/org/apache/mina/core/BenchmarkServerFactory.java
+++ b/benchmarks/src/test/java/org/apache/mina/core/BenchmarkServerFactory.java
@@ -19,6 +19,7 @@
*/
package org.apache.mina.core;
+import org.apache.mina.core.bio.udp.BioUdpBenchmarkServer;
import org.apache.mina.core.nio.tcp.Mina3TcpBenchmarkServer;
import org.apache.mina.core.nio.tcp.Netty3TcpBenchmarkServer;
import org.apache.mina.core.nio.udp.Mina3UdpBenchmarkServer;
@@ -44,6 +45,10 @@
return new Netty3TcpBenchmarkServer();
case Netty3_udp:
return new Netty3UdpBenchmarkServer();
+ case Bio_udp:
+ return new BioUdpBenchmarkServer();
+ case Bio_tcp:
+ //return new BioUdpBenchmarkClient();
default:
throw new IllegalArgumentException("Invalid type " + type);
}
diff --git a/benchmarks/src/test/java/org/apache/mina/core/Mina3ClientVsMina3ServerUdpBenchmarkBinaryTest.java b/benchmarks/src/test/java/org/apache/mina/core/Mina3ClientVsMina3ServerUdpBenchmarkBinaryTest.java
index 57dd6ca..96d726e 100644
--- a/benchmarks/src/test/java/org/apache/mina/core/Mina3ClientVsMina3ServerUdpBenchmarkBinaryTest.java
+++ b/benchmarks/src/test/java/org/apache/mina/core/Mina3ClientVsMina3ServerUdpBenchmarkBinaryTest.java
@@ -58,7 +58,7 @@
public static Collection<Object[]> getParameters() {
// Note : depending on your OS, the maximum PDU you can send can vary. See sysctl net.inet.udp.maxdgram
Object[][] parameters = new Object[][] {
- { 1000000, 10, 2 * 60 },
+ { 1000000, 10, 2 * 60 },
{ 1000000, 1 * 1024, 2 * 60 },
{ 1000000, 2 * 1024, 2 * 60 },
{ 1000000, 4 * 1024, 2 * 60 },
diff --git a/benchmarks/src/test/java/org/apache/mina/core/nio/udp/BioUdpBenchmarkClient.java b/benchmarks/src/test/java/org/apache/mina/core/bio/udp/BioUdpBenchmarkClient.java
similarity index 98%
rename from benchmarks/src/test/java/org/apache/mina/core/nio/udp/BioUdpBenchmarkClient.java
rename to benchmarks/src/test/java/org/apache/mina/core/bio/udp/BioUdpBenchmarkClient.java
index 4bf3cfa..fe0c062 100644
--- a/benchmarks/src/test/java/org/apache/mina/core/nio/udp/BioUdpBenchmarkClient.java
+++ b/benchmarks/src/test/java/org/apache/mina/core/bio/udp/BioUdpBenchmarkClient.java
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mina.core.nio.udp;
+package org.apache.mina.core.bio.udp;
import java.io.IOException;
import java.net.DatagramPacket;
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 286dbf8..36d5568 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
@@ -34,6 +34,8 @@
import org.apache.mina.transport.nio.NioUdpClient;
/**
+ * A MINA 3 based UDP client
+ *
* @author <a href="http://mina.apache.org">Apache MINA Project</a>
*/
public class Mina3UdpBenchmarkClient implements BenchmarkClient {
@@ -52,6 +54,7 @@
}
public void sessionOpened(IoSession session) {
+ System.out.println("Opened");
sendMessage(session, data);
}
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 cfb85cb..48b84b8 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
@@ -34,6 +34,8 @@
import org.apache.mina.transport.udp.UdpSessionConfig;
/**
+ * A MINA 3 based UDP server
+ *
* @author <a href="http://mina.apache.org">Apache MINA Project</a>
*/
public class Mina3UdpBenchmarkServer implements BenchmarkServer {
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 33214f3..5881679 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
@@ -38,6 +38,7 @@
import org.jboss.netty.channel.socket.nio.NioDatagramChannelFactory;
/**
+ * A Netty 3 based UDP client
* @author <a href="http://mina.apache.org">Apache MINA Project</a>
*/
public class Netty3UdpBenchmarkClient implements BenchmarkClient {
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 e1f41d0..3b04c96 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
@@ -43,6 +43,8 @@
import org.jboss.netty.channel.socket.nio.NioDatagramChannelFactory;
/**
+ * A Netty 3 based UDP server
+ *
* @author <a href="http://mina.apache.org">Apache MINA Project</a>
*/
public class Netty3UdpBenchmarkServer implements BenchmarkServer {
