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

Close all channels when SelectorEventLoop shuts down

Browse Source 
- Also removed a FIXME which was fixed already
This commit is contained in:
Trustin Lee 2012-05-11 11:01:44 +09:00
parent f6d6d1282c
commit a4678a6030
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
transport/src/main/java/io/netty/channel/AbstractChannel.java
View File

@ -612,7 +612,6 @@ public abstract class AbstractChannel extends DefaultAttributeMap implements Cha
@Override
public void read() {
assert eventLoop().inEventLoop();
// FIXME: Wrap with a loop
long readAmount = 0;
try {
boolean closed = false;

22
transport/src/main/java/io/netty/channel/socket/nio/SelectorEventLoop.java
View File

@ -27,6 +27,8 @@ import java.nio.channels.CancelledKeyException;
import java.nio.channels.SelectionKey;
import java.nio.channels.Selector;
import java.nio.channels.spi.SelectorProvider;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
import java.util.Set;
import java.util.concurrent.Executors;
@ -132,7 +134,7 @@ public class SelectorEventLoop extends SingleThreadEventLoop {
cancelledKeys = 0;
processTaskQueue();
processSelectedKeys(selector.selectedKeys());
processSelectedKeys();
// Handle connection timeout every 10 milliseconds approximately.
long currentTimeNanos = System.nanoTime();
@ -142,7 +144,7 @@ public class SelectorEventLoop extends SingleThreadEventLoop {
}
if (isShutdown()) {
// FIXME: Close all channels immediately and break the loop.
closeAll();
break;
}
} catch (Throwable t) {
@ -182,8 +184,8 @@ public class SelectorEventLoop extends SingleThreadEventLoop {
}
}
private void processSelectedKeys(Set<SelectionKey> selectedKeys) throws IOException {
for (Iterator<SelectionKey> i = selectedKeys.iterator(); i.hasNext();) {
private void processSelectedKeys() throws IOException {
for (Iterator<SelectionKey> i = selector.selectedKeys().iterator(); i.hasNext();) {
SelectionKey k = i.next();
Channel ch = (Channel) k.attachment();
boolean removeKey = true;
@ -267,6 +269,18 @@ public class SelectorEventLoop extends SingleThreadEventLoop {
return false;
}
private void closeAll() {
Set<SelectionKey> keys = selector.keys();
Collection<Channel> channels = new ArrayList<Channel>(keys.size());
for (SelectionKey k: keys) {
channels.add((Channel) k.attachment());
}
for (Channel ch: channels) {
ch.unsafe().close(ch.unsafe().voidFuture());
}
}
@Override
protected void wakeup(boolean inEventLoop) {
if (wakenUp.compareAndSet(false, true)) {