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

* Fixed a bug where write requests are allowed to be reentrant

Browse Source 
* Fixed a bug where writeLock is not used properly - what a dumb mistake
This commit is contained in:
Trustin Lee 2010-01-28 16:01:49 +00:00
parent 84cf41890c
commit 102b69d14f
4 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramChannel.java
View File

@ -15,7 +15,8 @@
*/
package org.jboss.netty.channel.socket.nio;
import static org.jboss.netty.channel.Channels.*;
import static org.jboss.netty.channel.Channels.fireChannelInterestChanged;
import static org.jboss.netty.channel.Channels.fireChannelOpen;
import java.io.IOException;
import java.net.InetAddress;
@ -27,7 +28,6 @@ import java.nio.channels.DatagramChannel;
import java.util.Queue;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
import org.jboss.netty.buffer.ChannelBuffer;
@ -78,7 +78,7 @@ class NioDatagramChannel extends AbstractChannel
/**
* Monitor object for synchronizing access to the {@link WriteBufferQueue}.
*/
final Lock writeLock = new ReentrantLock();
final ReentrantLock writeLock = new ReentrantLock();
/**
* WriteTask that performs write operations.

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

@ -34,6 +34,7 @@ import java.util.concurrent.Executor;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import org.jboss.netty.buffer.ChannelBuffer;
@ -446,7 +447,8 @@ class NioDatagramWorker implements Runnable {
return;
}
if (!channel.writeLock.tryLock()) {
final ReentrantLock writeLock = channel.writeLock;
if (writeLock.isHeldByCurrentThread() || !writeLock.tryLock()) {
rescheduleWrite(channel);
return;
}
@ -458,7 +460,7 @@ class NioDatagramWorker implements Runnable {
boolean removeOpWrite = false;
int writtenBytes = 0;
synchronized (channel.writeLock) {
try {
// loop forever...
for (;;) {
MessageEvent evt = channel.currentWriteEvent;
@ -535,6 +537,8 @@ class NioDatagramWorker implements Runnable {
fireExceptionCaught(channel, t);
}
}
} finally {
writeLock.unlock();
}
fireWriteComplete(channel, writtenBytes);
@ -622,7 +626,8 @@ class NioDatagramWorker implements Runnable {
boolean fireExceptionCaught = false;
// Clean up the stale messages in the write buffer.
synchronized (channel.writeLock) {
channel.writeLock.lock();
try {
MessageEvent evt = channel.currentWriteEvent;
ByteBuffer buf = channel.currentWriteBuffer;
if (evt != null) {
@ -667,6 +672,8 @@ class NioDatagramWorker implements Runnable {
fireExceptionCaught = true;
}
}
} finally {
channel.writeLock.unlock();
}
if (fireExceptionCaught) {

3
src/main/java/org/jboss/netty/channel/socket/nio/NioSocketChannel.java
View File

@ -24,7 +24,6 @@ import java.nio.channels.SocketChannel;
import java.util.Queue;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
import org.jboss.netty.buffer.ChannelBuffer;
@ -61,7 +60,7 @@ class NioSocketChannel extends AbstractChannel
private volatile InetSocketAddress remoteAddress;
final Object interestOpsLock = new Object();
final Lock writeLock = new ReentrantLock();
final ReentrantLock writeLock = new ReentrantLock();
final Runnable writeTask = new WriteTask();
final AtomicBoolean writeTaskInTaskQueue = new AtomicBoolean();

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

@ -34,6 +34,7 @@ import java.util.concurrent.Executor;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import org.jboss.netty.buffer.ChannelBuffer;
@ -378,8 +379,9 @@ class NioWorker implements Runnable {
cleanUpWriteBuffer(channel);
return;
}
if (!channel.writeLock.tryLock()) {
final ReentrantLock writeLock = channel.writeLock;
if (writeLock.isHeldByCurrentThread() || !writeLock.tryLock()) {
rescheduleWrite(channel);
return;
}
@ -460,7 +462,7 @@ class NioWorker implements Runnable {
}
}
} finally {
channel.writeLock.unlock();
writeLock.unlock();
}
fireWriteComplete(channel, writtenBytes);