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

* Proper synchronization and state management for HashedWheelTimer

Browse Source 
* Removed an unnecessary synchronization on a timer instance
This commit is contained in:
Trustin Lee 2009-02-11 05:05:20 +00:00
parent 4ea1d640c2
commit cb46aec1eb
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/java/org/jboss/netty/handler/timeout/HashedWheelTimer.java
View File

@ -156,11 +156,17 @@ public class HashedWheelTimer implements Timer {
return normalizedTicksPerWheel;
}
public void start() {
workerThread.start();
public synchronized void start() {
if (shutdown.get()) {
throw new IllegalStateException("cannot be started once stopped");
}
if (!workerThread.isAlive()) {
workerThread.start();
}
}
public Set<Timeout> stop() {
public synchronized Set<Timeout> stop() {
if (!shutdown.compareAndSet(false, true)) {
return Collections.emptySet();
}
@ -281,18 +287,16 @@ public class HashedWheelTimer implements Timer {
i.rewind();
while (i.hasNext()) {
HashedWheelTimeout timeout = i.next();
synchronized (timeout) {
if (timeout.remainingRounds <= 0) {
if (timeout.deadline <= currentTime) {
i.remove();
expiredTimeouts.add(timeout);
} else {
// A rare case where a timeout is put for the next
// round: just wait for the next round.
}
if (timeout.remainingRounds <= 0) {
if (timeout.deadline <= currentTime) {
i.remove();
expiredTimeouts.add(timeout);
} else {
timeout.remainingRounds --;
// A rare case where a timeout is put for the next
// round: just wait for the next round.
}
} else {
timeout.remainingRounds --;
}
}
}