* Added another test case that checks shutdown time
* Optimized the hex dump table generation in ChannelBuffers
This commit is contained in:
parent
a056b9af63
commit
e1709c8e4b
|
@ -106,11 +106,15 @@ public class ChannelBuffers {
|
||||||
*/
|
*/
|
||||||
public static ChannelBuffer EMPTY_BUFFER = new BigEndianHeapChannelBuffer(0);
|
public static ChannelBuffer EMPTY_BUFFER = new BigEndianHeapChannelBuffer(0);
|
||||||
|
|
||||||
private static final char[][] HEXDUMP_TABLE = new char[65536][];
|
private static final char[] HEXDUMP_TABLE = new char[65536 * 4];
|
||||||
|
|
||||||
static {
|
static {
|
||||||
for (int i = 0; i < 65536; i ++) {
|
final char[] DIGITS = "0123456789abcdef".toCharArray();
|
||||||
HEXDUMP_TABLE[i] = String.format("%04x", i).toCharArray();
|
for (int i = 0; i < 65536; i ++) {
|
||||||
|
HEXDUMP_TABLE[(i << 2) + 0] = DIGITS[i >>> 12 & 0x0F];
|
||||||
|
HEXDUMP_TABLE[(i << 2) + 1] = DIGITS[i >>> 8 & 0x0F];
|
||||||
|
HEXDUMP_TABLE[(i << 2) + 2] = DIGITS[i >>> 4 & 0x0F];
|
||||||
|
HEXDUMP_TABLE[(i << 2) + 3] = DIGITS[i >>> 0 & 0x0F];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -652,14 +656,14 @@ public class ChannelBuffers {
|
||||||
int dstIdx = 0;
|
int dstIdx = 0;
|
||||||
for (; srcIdx < endIndex; srcIdx += 2, dstIdx += 4) {
|
for (; srcIdx < endIndex; srcIdx += 2, dstIdx += 4) {
|
||||||
System.arraycopy(
|
System.arraycopy(
|
||||||
HEXDUMP_TABLE[buffer.getShort(srcIdx) & 0xFFFF],
|
HEXDUMP_TABLE, buffer.getUnsignedShort(srcIdx) << 2,
|
||||||
0, buf, dstIdx, 4);
|
buf, dstIdx, 4);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (oddLength) {
|
if (oddLength) {
|
||||||
System.arraycopy(
|
System.arraycopy(
|
||||||
HEXDUMP_TABLE[buffer.getByte(srcIdx) & 0xFF],
|
HEXDUMP_TABLE, (buffer.getUnsignedByte(srcIdx) << 2) + 2,
|
||||||
2, buf, dstIdx, 2);
|
buf, dstIdx, 2);
|
||||||
}
|
}
|
||||||
|
|
||||||
return new String(buf);
|
return new String(buf);
|
||||||
|
|
|
@ -0,0 +1,155 @@
|
||||||
|
/*
|
||||||
|
* JBoss, Home of Professional Open Source
|
||||||
|
*
|
||||||
|
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
|
||||||
|
* by the @author tags. See the COPYRIGHT.txt in the distribution for a
|
||||||
|
* full listing of individual contributors.
|
||||||
|
*
|
||||||
|
* This is free software; you can redistribute it and/or modify it
|
||||||
|
* under the terms of the GNU Lesser General Public License as
|
||||||
|
* published by the Free Software Foundation; either version 2.1 of
|
||||||
|
* the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This software is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
* Lesser General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Lesser General Public
|
||||||
|
* License along with this software; if not, write to the Free
|
||||||
|
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
|
||||||
|
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
|
||||||
|
*/
|
||||||
|
package org.jboss.netty.channel.socket;
|
||||||
|
|
||||||
|
import static org.junit.Assert.*;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.net.InetAddress;
|
||||||
|
import java.net.InetSocketAddress;
|
||||||
|
import java.net.Socket;
|
||||||
|
import java.util.concurrent.ExecutorService;
|
||||||
|
import java.util.concurrent.Executors;
|
||||||
|
import java.util.concurrent.TimeUnit;
|
||||||
|
|
||||||
|
import org.jboss.netty.bootstrap.ServerBootstrap;
|
||||||
|
import org.jboss.netty.channel.Channel;
|
||||||
|
import org.jboss.netty.channel.ChannelHandlerContext;
|
||||||
|
import org.jboss.netty.channel.ChannelPipelineCoverage;
|
||||||
|
import org.jboss.netty.channel.ChannelStateEvent;
|
||||||
|
import org.jboss.netty.channel.SimpleChannelHandler;
|
||||||
|
import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
|
||||||
|
import org.junit.Test;
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author The Netty Project (netty-dev@lists.jboss.org)
|
||||||
|
* @author Trustin Lee (tlee@redhat.com)
|
||||||
|
*
|
||||||
|
* @version $Rev$, $Date$
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
public class NioServerSocketShutdownTimeTest {
|
||||||
|
|
||||||
|
@Test(timeout = 10000)
|
||||||
|
public void testSuccessfulBindAttempt() throws Exception {
|
||||||
|
long startTime = System.currentTimeMillis();
|
||||||
|
|
||||||
|
ExecutorService e1 = Executors.newCachedThreadPool();
|
||||||
|
ExecutorService e2 = Executors.newCachedThreadPool();
|
||||||
|
|
||||||
|
ServerBootstrap bootstrap = new ServerBootstrap(
|
||||||
|
new NioServerSocketChannelFactory(e1, e2));
|
||||||
|
|
||||||
|
bootstrap.setOption("localAddress", new InetSocketAddress(0));
|
||||||
|
bootstrap.setOption("child.receiveBufferSize", 9753);
|
||||||
|
bootstrap.setOption("child.sendBufferSize", 8642);
|
||||||
|
|
||||||
|
DummyHandler handler = new DummyHandler();
|
||||||
|
bootstrap.getPipeline().addLast("dummy", handler);
|
||||||
|
|
||||||
|
Channel channel = bootstrap.bind();
|
||||||
|
|
||||||
|
Socket socket = null;
|
||||||
|
try {
|
||||||
|
socket = new Socket(
|
||||||
|
InetAddress.getLocalHost(),
|
||||||
|
((InetSocketAddress) channel.getLocalAddress()).getPort());
|
||||||
|
|
||||||
|
while (!handler.connected) {
|
||||||
|
try {
|
||||||
|
Thread.sleep(1);
|
||||||
|
} catch (InterruptedException e) {
|
||||||
|
// Ignore
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
socket.close();
|
||||||
|
|
||||||
|
while (!handler.closed) {
|
||||||
|
try {
|
||||||
|
Thread.sleep(1);
|
||||||
|
} catch (InterruptedException e) {
|
||||||
|
// Ignore
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} finally {
|
||||||
|
if (socket != null) {
|
||||||
|
try {
|
||||||
|
socket.close();
|
||||||
|
} catch (IOException e) {
|
||||||
|
// Ignore.
|
||||||
|
}
|
||||||
|
}
|
||||||
|
channel.close().awaitUninterruptibly();
|
||||||
|
|
||||||
|
e1.shutdownNow();
|
||||||
|
e2.shutdownNow();
|
||||||
|
|
||||||
|
for (;;) {
|
||||||
|
try {
|
||||||
|
if (e1.awaitTermination(1, TimeUnit.MILLISECONDS)) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
} catch (InterruptedException e) {
|
||||||
|
// Ignore.
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
for (;;) {
|
||||||
|
try {
|
||||||
|
if (e2.awaitTermination(1, TimeUnit.MILLISECONDS)) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
} catch (InterruptedException e) {
|
||||||
|
// Ignore.
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
long shutdownTime = System.currentTimeMillis() - startTime;
|
||||||
|
assertTrue("Shutdown takes too long: " + shutdownTime + " ms", shutdownTime < 500);
|
||||||
|
}
|
||||||
|
|
||||||
|
@ChannelPipelineCoverage("all")
|
||||||
|
private static class DummyHandler extends SimpleChannelHandler {
|
||||||
|
volatile boolean connected;
|
||||||
|
volatile boolean closed;
|
||||||
|
|
||||||
|
DummyHandler() {
|
||||||
|
super();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void channelConnected(ChannelHandlerContext ctx,
|
||||||
|
ChannelStateEvent e) throws Exception {
|
||||||
|
connected = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void channelClosed(ChannelHandlerContext ctx, ChannelStateEvent e)
|
||||||
|
throws Exception {
|
||||||
|
closed = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user