This commit is contained in:
Trustin Lee 2012-09-01 16:50:38 +09:00
parent bd3000858d
commit 79371e632c
3 changed files with 4 additions and 4 deletions

View File

@ -269,7 +269,7 @@ abstract class AbstractNioWorker implements Worker {
try {
long beforeSelect = System.nanoTime();
int selected = SelectorUtil.select(selector);
if (SelectorUtil.EPOOL_BUG_WORKAROUND && selected == 0 && !wakenupFromLoop && !wakenUp.get()) {
if (SelectorUtil.EPOLL_BUG_WORKAROUND && selected == 0 && !wakenupFromLoop && !wakenUp.get()) {
long timeBlocked = System.nanoTime() - beforeSelect;
if (timeBlocked < minSelectTimeout) {

View File

@ -253,7 +253,7 @@ class NioClientSocketPipelineSink extends AbstractNioChannelSink {
try {
long beforeSelect = System.nanoTime();
int selected = SelectorUtil.select(selector);
if (SelectorUtil.EPOOL_BUG_WORKAROUND && selected == 0 && !wakenupFromLoop && !wakenUp.get()) {
if (SelectorUtil.EPOLL_BUG_WORKAROUND && selected == 0 && !wakenupFromLoop && !wakenUp.get()) {
long timeBlocked = System.nanoTime() - beforeSelect;
if (timeBlocked < minSelectTimeout) {

View File

@ -32,7 +32,7 @@ final class SelectorUtil {
static final long DEFAULT_SELECT_TIMEOUT = 10;
static final long SELECT_TIMEOUT = SystemPropertyUtil.getLong("org.jboss.netty.selectTimeout", DEFAULT_SELECT_TIMEOUT);
static final long SELECT_TIMEOUT_NANOS = TimeUnit.MILLISECONDS.toNanos(SELECT_TIMEOUT);
static final boolean EPOOL_BUG_WORKAROUND = SystemPropertyUtil.getBoolean("org.jboss.netty.epollBugWorkaround", false);
static final boolean EPOLL_BUG_WORKAROUND = SystemPropertyUtil.getBoolean("org.jboss.netty.epollBugWorkaround", false);
// Workaround for JDK NIO bug.
//
@ -53,7 +53,7 @@ final class SelectorUtil {
}
if (logger.isDebugEnabled()) {
logger.debug("Using select timeout of " + SELECT_TIMEOUT);
logger.debug("Epoll-bug workaround enabled = " + EPOOL_BUG_WORKAROUND);
logger.debug("Epoll-bug workaround enabled = " + EPOLL_BUG_WORKAROUND);
}
}