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

Fixed ConcurrentModificationException

Browse Source
This commit is contained in:
Trustin Lee 2009-10-27 09:03:53 +00:00
parent 2663f85936
commit 4ec06f7c78
2 changed files with 12 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramWorker.java
View File

@ -333,7 +333,7 @@ class NioDatagramWorker implements Runnable {
}
}
private static void processSelectedKeys(final Set<SelectionKey> selectedKeys) {
private void processSelectedKeys(final Set<SelectionKey> selectedKeys) {
for (Iterator<SelectionKey> i = selectedKeys.iterator(); i.hasNext();) {
SelectionKey k = i.next();
i.remove();
@ -351,6 +351,10 @@ class NioDatagramWorker implements Runnable {
} catch (CancelledKeyException e) {
close(k);
}
if (cancelledKeys >= 128) { // FIXME hardcoded value
break;
}
}
}
@ -650,37 +654,15 @@ class NioDatagramWorker implements Runnable {
// Otherwise DatagramChannel.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.getDatagramChannel().keyFor(selector);
if (key != null) {
key.cancel();
cancelled = true;
worker.cancelledKeys ++;
}
channel.getDatagramChannel().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.
if (Thread.currentThread() == worker.thread) {
selector.selectNow();
if (worker.wakenUp.get()) {
selector.wakeup();
}
} else {
if (worker.wakenUp.compareAndSet(false, true)) {
selector.wakeup();
}
}
}
}
if (channel.setClosed()) {
future.setSuccess();
if (connected) {

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

@ -264,7 +264,7 @@ class NioWorker implements Runnable {
}
}
private static void processSelectedKeys(Set<SelectionKey> selectedKeys) {
private void processSelectedKeys(Set<SelectionKey> selectedKeys) {
for (Iterator<SelectionKey> i = selectedKeys.iterator(); i.hasNext();) {
SelectionKey k = i.next();
i.remove();
@ -282,6 +282,10 @@ class NioWorker implements Runnable {
} catch (CancelledKeyException e) {
close(k);
}
if (cancelledKeys >= 128) { // FIXME hardcoded value
break;
}
}
}
@ -568,37 +572,15 @@ 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();
cancelled = true;
worker.cancelledKeys ++;
}
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.
if (Thread.currentThread() == worker.thread) {
selector.selectNow();
if (worker.wakenUp.get()) {
selector.wakeup();
}
} else {
if (worker.wakenUp.compareAndSet(false, true)) {
selector.wakeup();
}
}
}
}
if (channel.setClosed()) {
future.setSuccess();
if (connected) {