andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add EventLoopFactory and make MultithreadEventLoop use it

Browse Source 
- based on the feed back from @normanmaurer
This commit is contained in:
Trustin Lee 2012-05-11 21:47:07 +09:00
parent 97c07708a2
commit c57d7dd098
5 changed files with 32 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
example/src/main/java/io/netty/example/echo/EchoClient.java
View File

@ -26,8 +26,6 @@ import io.netty.channel.MultithreadEventLoop;
import io.netty.channel.socket.SocketChannel;
import io.netty.channel.socket.nio.NioSocketChannel;
import io.netty.channel.socket.nio.SelectorEventLoop;
import io.netty.handler.logging.LoggingHandler;
import io.netty.logging.InternalLogLevel;
import java.net.InetSocketAddress;
import java.util.concurrent.atomic.AtomicLong;
@ -52,10 +50,10 @@ public class EchoClient {
}
public void run() throws Exception {
EventLoop loop = new MultithreadEventLoop(SelectorEventLoop.class);
EventLoop loop = new MultithreadEventLoop(SelectorEventLoop.FACTORY);
SocketChannel s = new NioSocketChannel();
s.config().setTcpNoDelay(true);
s.pipeline().addLast("logger", new LoggingHandler(InternalLogLevel.INFO));
//s.pipeline().addLast("logger", new LoggingHandler(InternalLogLevel.INFO));
s.pipeline().addLast("echoer", new ChannelInboundHandlerAdapter<Byte>() {
private final ChannelBuffer firstMessage;

4
example/src/main/java/io/netty/example/echo/EchoServer.java
View File

@ -49,7 +49,7 @@ public class EchoServer {
public void run() throws Exception {
// Configure the server.
final EventLoop loop = new MultithreadEventLoop(SelectorEventLoop.class);
final EventLoop loop = new MultithreadEventLoop(SelectorEventLoop.FACTORY);
ServerSocketChannel ssc = new NioServerSocketChannel();
ssc.pipeline().addLast("logger", new LoggingHandler(InternalLogLevel.INFO));
ssc.pipeline().addLast("acceptor", new ChannelInboundHandlerAdapter<SocketChannel>() {
@ -72,7 +72,7 @@ public class EchoServer {
break;
}
s.config().setTcpNoDelay(true);
s.pipeline().addLast("logger", new LoggingHandler(InternalLogLevel.INFO));
//s.pipeline().addLast("logger", new LoggingHandler(InternalLogLevel.INFO));
s.pipeline().addLast("echoer", new ChannelInboundHandlerAdapter<Byte>() {
@Override
public ChannelBufferHolder<Byte> newInboundBuffer(ChannelInboundHandlerContext<Byte> ctx) {

7
transport/src/main/java/io/netty/channel/EventLoopFactory.java Normal file
View File

@ -0,0 +1,7 @@
package io.netty.channel;
import java.util.concurrent.ThreadFactory;
public interface EventLoopFactory<T extends EventLoop> {
T newEventLoop(ThreadFactory threadFactory) throws Exception;
}

21
transport/src/main/java/io/netty/channel/MultithreadEventLoop.java
View File

@ -18,20 +18,21 @@ public class MultithreadEventLoop implements EventLoop {
private final EventLoop[] children;
private final AtomicInteger childIndex = new AtomicInteger();
public MultithreadEventLoop(Class<? extends SingleThreadEventLoop> loopType) {
this(loopType, Runtime.getRuntime().availableProcessors() * 2);
public MultithreadEventLoop(EventLoopFactory<? extends SingleThreadEventLoop> loopFactory) {
this(loopFactory, Runtime.getRuntime().availableProcessors() * 2);
}
public MultithreadEventLoop(Class<? extends SingleThreadEventLoop> loopType, int nThreads) {
this(loopType, nThreads, Executors.defaultThreadFactory());
public MultithreadEventLoop(EventLoopFactory<? extends SingleThreadEventLoop> loopFactory, int nThreads) {
this(loopFactory, nThreads, Executors.defaultThreadFactory());
}
public MultithreadEventLoop(Class<? extends SingleThreadEventLoop> loopType, int nThreads, ThreadFactory threadFactory) {
if (loopType == null) {
throw new NullPointerException("loopType");
public MultithreadEventLoop(EventLoopFactory<? extends SingleThreadEventLoop> loopFactory, int nThreads, ThreadFactory threadFactory) {
if (loopFactory == null) {
throw new NullPointerException("loopFactory");
}
if (nThreads <= 0) {
throw new IllegalArgumentException("nThreads: " + nThreads + " (expected: > 0)");
throw new IllegalArgumentException(String.format(
"nThreads: %d (expected: > 0)", nThreads));
}
if (threadFactory == null) {
throw new NullPointerException("threadFactory");
@ -41,10 +42,10 @@ public class MultithreadEventLoop implements EventLoop {
for (int i = 0; i < nThreads; i ++) {
boolean success = false;
try {
children[i] = loopType.getConstructor(ThreadFactory.class).newInstance(threadFactory);
children[i] = loopFactory.newEventLoop(threadFactory);
success = true;
} catch (Exception e) {
throw new EventLoopException("failed to create a child event loop: " + loopType.getName(), e);
throw new EventLoopException("failed to create a child event loop", e);
} finally {
if (!success) {
for (int j = 0; j < i; j ++) {

10
transport/src/main/java/io/netty/channel/socket/nio/SelectorEventLoop.java
View File

@ -17,6 +17,7 @@ package io.netty.channel.socket.nio;
import io.netty.channel.Channel;
import io.netty.channel.ChannelException;
import io.netty.channel.EventLoopFactory;
import io.netty.channel.SingleThreadEventLoop;
import io.netty.logging.InternalLogger;
import io.netty.logging.InternalLoggerFactory;
@ -35,6 +36,15 @@ import java.util.concurrent.ThreadFactory;
import java.util.concurrent.atomic.AtomicBoolean;
public class SelectorEventLoop extends SingleThreadEventLoop {
public static final EventLoopFactory<SelectorEventLoop> FACTORY = new EventLoopFactory<SelectorEventLoop>() {
@Override
public SelectorEventLoop newEventLoop(ThreadFactory threadFactory)
throws Exception {
return new SelectorEventLoop(threadFactory);
}
};
/**
* Internal Netty logger.
*/