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

Fixed issue: NETTY-26 (Infinite blocking in old blocking I/O transport.)

Browse Source 
* Added a proper interrupt() call in OioWorker.close() to wake the worker thread up
This commit is contained in:
Trustin Lee 2008-08-23 10:23:54 +00:00
parent b4c6d82be7
commit a0d9a59206
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/org/jboss/netty/channel/socket/oio/OioWorker.java
View File

@ -44,10 +44,12 @@ class OioWorker implements Runnable {
channel.workerThread = Thread.currentThread();
final PushbackInputStream in = channel.getInputStream();
for (;;) {
while (channel.isOpen()) {
synchronized (this) {
while (!channel.isReadable()) {
try {
// notify() is not called at all.
// close() and setInterestOps() calls Thread.interrupt()
this.wait();
} catch (InterruptedException e) {
if (!channel.isOpen()) {
@ -83,10 +85,17 @@ class OioWorker implements Runnable {
if (readBytes == buf.length) {
buffer = ChannelBuffers.wrappedBuffer(buf);
} else {
// A rare case, but it sometimes happen.
buffer = ChannelBuffers.wrappedBuffer(buf, 0, readBytes);
}
fireMessageReceived(channel, buffer);
}
// Setting the workerThread to null will prevent any channel
// operations from interrupting this thread from now on.
channel.workerThread = null;
// Clean up.
close(channel, channel.getSucceededFuture());
}
@ -122,7 +131,7 @@ class OioWorker implements Runnable {
future.setSuccess();
if (changed) {
// Notify the worker so it stops reading.
// Notify the worker so it stops or continues reading.
Thread currentThread = Thread.currentThread();
Thread workerThread = channel.workerThread;
if (workerThread != null && currentThread != workerThread) {
@ -146,6 +155,13 @@ class OioWorker implements Runnable {
future.setSuccess();
if (channel.setClosed()) {
if (connected) {
// Notify the worker so it stops reading.
Thread currentThread = Thread.currentThread();
Thread workerThread = channel.workerThread;
if (workerThread != null && currentThread != workerThread) {
workerThread.interrupt();
}
if (channel.getInterestOps() != Channel.OP_WRITE) {
channel.setInterestOpsNow(Channel.OP_WRITE);
fireChannelInterestChanged(channel, Channel.OP_WRITE);