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

* Fixed failing shutdown time test

Browse Source
This commit is contained in:
Trustin Lee 2009-10-27 06:11:47 +00:00
parent 5edf0242e8
commit ff6cf1787e
1 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/main/java/org/jboss/netty/channel/socket/nio/NioWorker.java
View File

@ -22,6 +22,7 @@ import java.net.SocketAddress;
import java.nio.channels.AsynchronousCloseException;
import java.nio.channels.CancelledKeyException;
import java.nio.channels.ClosedChannelException;
import java.nio.channels.ClosedSelectorException;
import java.nio.channels.NotYetConnectedException;
import java.nio.channels.ScatteringByteChannel;
import java.nio.channels.SelectionKey;
@ -568,23 +569,35 @@ class NioWorker implements Runnable {
// Otherwise SocketChannel.register() in RegisterTask can be called
// after cancel(), but before close(), resulting in the infinite
// Selector loop that refuses to shut down due to the dangling keys.
boolean cancelled = false;
synchronized (channel.interestOpsLock) {
SelectionKey key = channel.socket.keyFor(selector);
if (key != null) {
key.cancel();
int cancelledKeys = ++ worker.cancelledKeys;
if (cancelledKeys >= 128) { // FIXME hardcoded value
worker.cancelledKeys = 0;
// Reclaim the associated file descriptors immediately.
// Otherwise the process will experience sudden spike
// in the number of open files, with high chance of getting
// the 'too many open files' error.
selector.selectNow();
}
cancelled = true;
}
channel.socket.close();
}
if (cancelled) {
int cancelledKeys = ++ worker.cancelledKeys;
if (cancelledKeys >= 128) { // FIXME hardcoded value
worker.cancelledKeys = 0;
// Reclaim the associated file descriptors immediately.
// Otherwise the process will experience sudden spike
// in the number of open files, with high chance of getting
// the 'too many open files' error.
try {
selector.selectNow();
if (worker.wakenUp.get()) {
selector.wakeup();
}
} catch (ClosedSelectorException e) {
// Can happen - ignore.
}
}
}
if (channel.setClosed()) {
future.setSuccess();
if (connected) {