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

AbstractNioWorker -> SelectorEventLoop

Browse Source
This commit is contained in:
Trustin Lee 2012-04-03 22:21:11 +09:00
parent 0d8afa7a4c
commit a8647d6dc8
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
transport/src/main/java/io/netty/channel/socket/nio/AbstractNioChannel.java
View File

@ -39,9 +39,9 @@ import java.util.concurrent.atomic.AtomicInteger;
public abstract class AbstractNioChannel extends AbstractChannel implements NioChannel {
/**
* The {@link AbstractNioWorker}.
* The {@link SelectorEventLoop}.
*/
private final AbstractNioWorker worker;
private final SelectorEventLoop worker;
/**
* Monitor object to synchronize access to InterestedOps.
@ -97,7 +97,7 @@ public abstract class AbstractNioChannel extends AbstractChannel implements NioC
private final JdkChannel channel;
protected AbstractNioChannel(Integer id, Channel parent, ChannelFactory factory, ChannelPipeline pipeline, ChannelSink sink, AbstractNioWorker worker, JdkChannel ch) {
protected AbstractNioChannel(Integer id, Channel parent, ChannelFactory factory, ChannelPipeline pipeline, ChannelSink sink, SelectorEventLoop worker, JdkChannel ch) {
super(id, parent, factory, pipeline, sink);
this.worker = worker;
this.channel = ch;
@ -105,7 +105,7 @@ public abstract class AbstractNioChannel extends AbstractChannel implements NioC
protected AbstractNioChannel(
Channel parent, ChannelFactory factory,
ChannelPipeline pipeline, ChannelSink sink, AbstractNioWorker worker, JdkChannel ch) {
ChannelPipeline pipeline, ChannelSink sink, SelectorEventLoop worker, JdkChannel ch) {
super(parent, factory, pipeline, sink);
this.worker = worker;
this.channel = ch;
@ -116,11 +116,11 @@ public abstract class AbstractNioChannel extends AbstractChannel implements NioC
}
/**
* Return the {@link AbstractNioWorker} that handle the IO of the {@link AbstractNioChannel}
* Return the {@link SelectorEventLoop} that handle the IO of the {@link AbstractNioChannel}
*
* @return worker
*/
public AbstractNioWorker getWorker() {
public SelectorEventLoop getWorker() {
return worker;
}

6
transport/src/main/java/io/netty/channel/socket/nio/AbstractNioWorkerPool.java
View File

@ -29,9 +29,9 @@ import java.util.concurrent.atomic.AtomicInteger;
* {@link #nextWorker()}
*
*/
public abstract class AbstractNioWorkerPool<E extends AbstractNioWorker> implements WorkerPool<E> , ExternalResourceReleasable {
public abstract class AbstractNioWorkerPool<E extends SelectorEventLoop> implements WorkerPool<E> , ExternalResourceReleasable {
private final AbstractNioWorker[] workers;
private final SelectorEventLoop[] workers;
private final AtomicInteger workerIndex = new AtomicInteger();
private final Executor workerExecutor;
@ -51,7 +51,7 @@ public abstract class AbstractNioWorkerPool<E extends AbstractNioWorker> impleme
"workerCount (" + workerCount + ") " +
"must be a positive integer.");
}
workers = new AbstractNioWorker[workerCount];
workers = new SelectorEventLoop[workerCount];
for (int i = 0; i < workers.length; i++) {
workers[i] = createWorker(workerExecutor, allowShutDownOnIdle);

2
transport/src/main/java/io/netty/channel/socket/nio/NioDatagramWorker.java
View File

@ -43,7 +43,7 @@ import java.util.concurrent.Executor;
* A class responsible for registering channels with {@link Selector}.
* It also implements the {@link Selector} loop.
*/
public class NioDatagramWorker extends AbstractNioWorker {
public class NioDatagramWorker extends SelectorEventLoop {
/**
* Sole constructor.

2
transport/src/main/java/io/netty/channel/socket/nio/NioWorker.java
View File

@ -34,7 +34,7 @@ import java.nio.channels.SelectionKey;
import java.nio.channels.SocketChannel;
import java.util.concurrent.Executor;
public class NioWorker extends AbstractNioWorker {
public class NioWorker extends SelectorEventLoop {
protected final ReceiveBufferPool recvBufferPool = new ReceiveBufferPool();

8
transport/src/main/java/io/netty/channel/socket/nio/AbstractNioWorker.java → transport/src/main/java/io/netty/channel/socket/nio/SelectorEventLoop.java
View File

@ -47,12 +47,12 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
import static io.netty.channel.Channels.*;
abstract class AbstractNioWorker extends SingleThreadEventLoop {
abstract class SelectorEventLoop extends SingleThreadEventLoop {
/**
* Internal Netty logger.
*/
protected static final InternalLogger logger = InternalLoggerFactory
.getInstance(AbstractNioWorker.class);
.getInstance(SelectorEventLoop.class);
private static final int CONSTRAINT_LEVEL = NioProviderMetadata.CONSTRAINT_LEVEL;
@ -86,11 +86,11 @@ abstract class AbstractNioWorker extends SingleThreadEventLoop {
protected final SendBufferPool sendBufferPool = new SendBufferPool();
protected AbstractNioWorker() {
protected SelectorEventLoop() {
selector = openSelector();
}
protected AbstractNioWorker(ThreadFactory threadFactory) {
protected SelectorEventLoop(ThreadFactory threadFactory) {
super(threadFactory);
selector = openSelector();
}