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

Add javadocs and cleanup. Part of #613

Browse Source
This commit is contained in:
Norman Maurer 2012-09-21 20:25:18 +02:00
parent 0ee4bbf8e7
commit ef0ee5f7ba
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/org/jboss/netty/channel/socket/nio/NioClientSocketChannelFactory.java
View File

@ -152,12 +152,34 @@ public class NioClientSocketChannelFactory implements ClientSocketChannelFactory
this(bossExecutor, bossCount, new NioWorkerPool(workerExecutor, workerCount));
}
/**
* Creates a new instance.
*
* @param bossExecutor
* the {@link Executor} which will execute the boss thread
* @param bossCount
* the maximum number of boss threads
* @param workerPool
* the {@link WorkerPool} to use to do the IO
*/
public NioClientSocketChannelFactory(
Executor bossExecutor, int bossCount,
WorkerPool<NioWorker> workerPool) {
this(bossExecutor, bossCount, workerPool, new HashedWheelTimer());
}
/**
* Creates a new instance.
*
* @param bossExecutor
* the {@link Executor} which will execute the boss thread
* @param bossCount
* the maximum number of boss threads
* @param workerPool
* the {@link WorkerPool} to use to do the IO
* @param timer
* the {@link Timer} to use to handle the connection timeouts
*/
public NioClientSocketChannelFactory(
Executor bossExecutor, int bossCount,
WorkerPool<NioWorker> workerPool, Timer timer) {

3
src/main/java/org/jboss/netty/channel/socket/nio/NioClientSocketPipelineSink.java
View File

@ -46,7 +46,6 @@ import org.jboss.netty.channel.ChannelStateEvent;
import org.jboss.netty.channel.MessageEvent;
import org.jboss.netty.logging.InternalLogger;
import org.jboss.netty.logging.InternalLoggerFactory;
import org.jboss.netty.util.HashedWheelTimer;
import org.jboss.netty.util.Timeout;
import org.jboss.netty.util.Timer;
import org.jboss.netty.util.TimerTask;
@ -265,7 +264,6 @@ class NioClientSocketPipelineSink extends AbstractNioChannelSink {
int selectReturnsImmediately = 0;
Selector selector = this.selector;
long lastConnectTimeoutCheckTimeNanos = System.nanoTime();
// use 80% of the timeout for measure
final long minSelectTimeout = SelectorUtil.SELECT_TIMEOUT_NANOS * 80 / 100;
@ -362,7 +360,6 @@ class NioClientSocketPipelineSink extends AbstractNioChannelSink {
// Handle connection timeout every 10 milliseconds approximately.
long currentTimeNanos = System.nanoTime();
lastConnectTimeoutCheckTimeNanos = currentTimeNanos;
processConnectTimeout(selector.keys(), currentTimeNanos);
// Exit the loop when there's nothing to handle.