You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by jv...@apache.org on 2013/06/06 15:47:51 UTC
[1/2] git commit: removed useless catched IOException
Updated Branches:
refs/heads/trunk c885df4b7 -> 41d26f6b8
removed useless catched IOException
Project: http://git-wip-us.apache.org/repos/asf/mina/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina/commit/92a7bca4
Tree: http://git-wip-us.apache.org/repos/asf/mina/tree/92a7bca4
Diff: http://git-wip-us.apache.org/repos/asf/mina/diff/92a7bca4
Branch: refs/heads/trunk
Commit: 92a7bca47fddaf8c48a840e4a9f0ca00f6336281
Parents: c885df4
Author: jvermillard <jv...@apache.org>
Authored: Thu Jun 6 15:45:47 2013 +0200
Committer: jvermillard <jv...@apache.org>
Committed: Thu Jun 6 15:45:47 2013 +0200
----------------------------------------------------------------------
.../mina/examples/coap/BlockingGetClient.java | 89 +++++++++++++++
.../apache/mina/examples/coap/CoapGetServer.java | 28 ++++-
.../mina/examples/echoclient/NioEchoClient.java | 3 -
.../mina/examples/echoserver/NioEchoServer.java | 3 -
.../mina/examples/udpecho/NioUdpEchoServer.java | 3 -
5 files changed, 110 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina/blob/92a7bca4/examples/src/main/java/org/apache/mina/examples/coap/BlockingGetClient.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/mina/examples/coap/BlockingGetClient.java b/examples/src/main/java/org/apache/mina/examples/coap/BlockingGetClient.java
new file mode 100644
index 0000000..5d07693
--- /dev/null
+++ b/examples/src/main/java/org/apache/mina/examples/coap/BlockingGetClient.java
@@ -0,0 +1,89 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.mina.examples.coap;
+
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.net.SocketAddress;
+import java.nio.ByteBuffer;
+import java.nio.channels.DatagramChannel;
+import java.util.Random;
+
+import org.apache.mina.coap.CoapCode;
+import org.apache.mina.coap.CoapMessage;
+import org.apache.mina.coap.CoapOption;
+import org.apache.mina.coap.CoapOptionType;
+import org.apache.mina.coap.MessageType;
+import org.apache.mina.coap.codec.CoapDecoder;
+import org.apache.mina.coap.codec.CoapEncoder;
+
+public class BlockingGetClient {
+
+ public static void main(String[] args) {
+ try {
+ DatagramChannel channel = DatagramChannel.open();
+
+ InetSocketAddress target = new InetSocketAddress("127.0.0.1", 5683);
+
+ channel.connect(target);
+
+ System.err.println(channel);
+
+ CoapEncoder encoder = new CoapEncoder();
+ CoapDecoder decoder = new CoapDecoder();
+ ByteBuffer buff = ByteBuffer.allocateDirect(2048);
+
+ Random r = new Random();
+ byte[] url = "nlp".getBytes();
+ CoapMessage msg = new CoapMessage(1, MessageType.CONFIRMABLE, CoapCode.GET.getCode(), 1234, null,
+ new CoapOption[] { new CoapOption(CoapOptionType.URI_PATH, url) }, null);
+
+ for (int j = 0; j < 8; j++) {
+ long start = System.currentTimeMillis();
+ final int count = 100000;
+ for (int i = 0; i < count; i++) {
+ buff.position(0);
+ buff.limit(buff.capacity());
+ int id = r.nextInt(1024);
+ msg.setId(id);
+ int bytes = channel.send(encoder.encode(msg, null), target);
+
+ if (bytes < 1) {
+ System.err.println("write fail :/ " + bytes);
+ } else {
+ buff.position(0);
+ buff.limit(buff.capacity());
+ SocketAddress addy = channel.receive(buff);
+ buff.flip();
+ CoapMessage response = decoder.decode(buff, null);
+ if (response.getId() != id) {
+ System.err.println("gni?");
+ }
+ // System.err.println("response : " + response);
+ }
+ }
+ System.err.println("time : " + (System.currentTimeMillis() - start) + "ms");
+ }
+
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/mina/blob/92a7bca4/examples/src/main/java/org/apache/mina/examples/coap/CoapGetServer.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/mina/examples/coap/CoapGetServer.java b/examples/src/main/java/org/apache/mina/examples/coap/CoapGetServer.java
index c968f91..286c927 100644
--- a/examples/src/main/java/org/apache/mina/examples/coap/CoapGetServer.java
+++ b/examples/src/main/java/org/apache/mina/examples/coap/CoapGetServer.java
@@ -19,7 +19,6 @@
*/
package org.apache.mina.examples.coap;
-import java.io.IOException;
import java.nio.ByteBuffer;
import org.apache.mina.api.AbstractIoHandler;
@@ -69,16 +68,33 @@ public class CoapGetServer {
});
BioUdpServer server = new BioUdpServer();
- server.setFilters(new ProtocolCodecFilter<CoapMessage, ByteBuffer, Void, Void>(new CoapEncoder(),
- new CoapDecoder()));
+ server.setFilters(/* new LoggingFilter(), */new ProtocolCodecFilter<CoapMessage, ByteBuffer, Void, Void>(
+ new CoapEncoder(), new CoapDecoder()));
server.getSessionConfig().setIdleTimeInMillis(IdleStatus.READ_IDLE, 20000);
server.setIoHandler(new AbstractIoHandler() {
+
+ long start = System.currentTimeMillis();
+ int count = 0;
+
@Override
public void messageReceived(IoSession session, Object message) {
- System.err.println("rcv : " + message);
+ // System.err.println("rcv : " + message);
+
CoapMessage resp = reg.respond((CoapMessage) message);
- System.err.println("resp : " + resp);
+ // System.err.println("resp : " + resp);
session.write(resp);
+ count++;
+ if (count >= 100000) {
+ System.err.println("time for 100k msg : " + (System.currentTimeMillis() - start));
+ count = 0;
+ start = System.currentTimeMillis();
+ }
+ }
+
+ @Override
+ public void sessionIdle(IoSession session, IdleStatus status) {
+ System.err.println("idle closing");
+ session.close(false);
}
});
@@ -87,8 +103,6 @@ public class CoapGetServer {
for (;;) {
Thread.sleep(1000);
}
- } catch (IOException e) {
- e.printStackTrace();
} catch (InterruptedException e) {
e.printStackTrace();
}
http://git-wip-us.apache.org/repos/asf/mina/blob/92a7bca4/examples/src/main/java/org/apache/mina/examples/echoclient/NioEchoClient.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/mina/examples/echoclient/NioEchoClient.java b/examples/src/main/java/org/apache/mina/examples/echoclient/NioEchoClient.java
index 62317f4..4941e84 100644
--- a/examples/src/main/java/org/apache/mina/examples/echoclient/NioEchoClient.java
+++ b/examples/src/main/java/org/apache/mina/examples/echoclient/NioEchoClient.java
@@ -20,7 +20,6 @@
package org.apache.mina.examples.echoclient;
-import java.io.IOException;
import java.net.InetSocketAddress;
import java.nio.ByteBuffer;
import java.util.concurrent.ExecutionException;
@@ -87,8 +86,6 @@ public class NioEchoClient {
LOG.debug("Running the client for 25 sec");
Thread.sleep(25000);
- } catch (IOException e) {
- LOG.error("connection error : {}", e);
} catch (InterruptedException e) {
}
}
http://git-wip-us.apache.org/repos/asf/mina/blob/92a7bca4/examples/src/main/java/org/apache/mina/examples/echoserver/NioEchoServer.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/mina/examples/echoserver/NioEchoServer.java b/examples/src/main/java/org/apache/mina/examples/echoserver/NioEchoServer.java
index c24f047..754dcdb 100644
--- a/examples/src/main/java/org/apache/mina/examples/echoserver/NioEchoServer.java
+++ b/examples/src/main/java/org/apache/mina/examples/echoserver/NioEchoServer.java
@@ -20,7 +20,6 @@
package org.apache.mina.examples.echoserver;
-import java.io.IOException;
import java.net.InetSocketAddress;
import java.net.SocketAddress;
import java.nio.ByteBuffer;
@@ -113,8 +112,6 @@ public class NioEchoServer {
Thread.sleep(25000);
LOG.debug("Unbinding the TCP port");
acceptor.unbind();
- } catch (final IOException e) {
- LOG.error("I/O exception", e);
} catch (final InterruptedException e) {
LOG.error("Interrupted exception", e);
}
http://git-wip-us.apache.org/repos/asf/mina/blob/92a7bca4/examples/src/main/java/org/apache/mina/examples/udpecho/NioUdpEchoServer.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/mina/examples/udpecho/NioUdpEchoServer.java b/examples/src/main/java/org/apache/mina/examples/udpecho/NioUdpEchoServer.java
index b8ec096..145a800 100644
--- a/examples/src/main/java/org/apache/mina/examples/udpecho/NioUdpEchoServer.java
+++ b/examples/src/main/java/org/apache/mina/examples/udpecho/NioUdpEchoServer.java
@@ -19,7 +19,6 @@
*/
package org.apache.mina.examples.udpecho;
-import java.io.IOException;
import java.net.InetSocketAddress;
import java.net.SocketAddress;
import java.nio.ByteBuffer;
@@ -111,8 +110,6 @@ public class NioUdpEchoServer {
Thread.sleep(25000);
LOG.debug("Unbinding the UDP port");
server.unbind();
- } catch (final IOException e) {
- LOG.error("I/O exception", e);
} catch (final InterruptedException e) {
LOG.error("Interrupted exception", e);
}
[2/2] git commit: removed useless method
Posted by jv...@apache.org.
removed useless method
Project: http://git-wip-us.apache.org/repos/asf/mina/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina/commit/41d26f6b
Tree: http://git-wip-us.apache.org/repos/asf/mina/tree/41d26f6b
Diff: http://git-wip-us.apache.org/repos/asf/mina/diff/41d26f6b
Branch: refs/heads/trunk
Commit: 41d26f6b86c560b67e4125e173cfd9ce27c3ec62
Parents: 92a7bca
Author: jvermillard <jv...@apache.org>
Authored: Thu Jun 6 15:46:14 2013 +0200
Committer: jvermillard <jv...@apache.org>
Committed: Thu Jun 6 15:46:14 2013 +0200
----------------------------------------------------------------------
.../mina/transport/udp/AbstractUdpClient.java | 9 ---------
1 files changed, 0 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina/blob/41d26f6b/core/src/main/java/org/apache/mina/transport/udp/AbstractUdpClient.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/mina/transport/udp/AbstractUdpClient.java b/core/src/main/java/org/apache/mina/transport/udp/AbstractUdpClient.java
index a8d9747..c71b358 100644
--- a/core/src/main/java/org/apache/mina/transport/udp/AbstractUdpClient.java
+++ b/core/src/main/java/org/apache/mina/transport/udp/AbstractUdpClient.java
@@ -21,8 +21,6 @@ package org.apache.mina.transport.udp;
import java.net.SocketAddress;
-import javax.net.ssl.SSLException;
-
import org.apache.mina.api.IoFuture;
import org.apache.mina.api.IoSession;
import org.apache.mina.service.client.AbstractIoClient;
@@ -43,13 +41,6 @@ public abstract class AbstractUdpClient extends AbstractIoClient {
}
/**
- * {@inheritDoc}
- */
- public void initSecured(IoSession session) throws SSLException {
- // Do nothing : UDP does not support SSL
- }
-
- /**
* Connects to the specified remote address binding to the specified local address.
*
* @param remoteAddress Remote {@link SocketAddress} to connect