Upstream/ProtocolLib
1
0
Fork 0
mirror of https://github.com/dmulloy2/ProtocolLib.git synced 2024-11-27 21:26:17 +01:00
Code Issues Projects Releases Wiki Activity

Create the worker ID before it is run.

Browse Source 
In addition, we'll prevent reuse of worker objects.
This commit is contained in:
Kristian S. Stangeland 2012-10-04 06:23:27 +02:00
parent af2d692c59
commit debf8c4d88
2 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ProtocolLib/src/com/comphenix/protocol/async/AsyncListenerHandler.java
View File

@ -135,8 +135,9 @@ public class AsyncListenerHandler {
public AsyncRunnable getListenerLoop() { public AsyncRunnable getListenerLoop() {
return new AsyncRunnable() { return new AsyncRunnable() {
private final AtomicBoolean running = new AtomicBoolean(); private final AtomicBoolean firstRun = new AtomicBoolean();
private volatile int id; private final AtomicBoolean finished = new AtomicBoolean();
private final int id = nextID.incrementAndGet();
@Override @Override
public int getID() { public int getID() {
@ -146,17 +147,20 @@ public class AsyncListenerHandler {
@Override @Override
public void run() { public void run() {
// Careful now // Careful now
if (running.compareAndSet(false, true)) { if (firstRun.compareAndSet(false, true)) {
id = nextID.incrementAndGet();
listenerLoop(id); listenerLoop(id);
synchronized (stopLock) { synchronized (stopLock) {
stoppedTasks.remove(id); stoppedTasks.remove(id);
stopLock.notifyAll(); stopLock.notifyAll();
running.set(false); finished.set(true);
} }
} else { } else {
if (finished.get())
throw new IllegalStateException(
"This listener has already been run. Create a new instead.");
else
throw new IllegalStateException( throw new IllegalStateException(
"This listener loop has already been started. Create a new instead."); "This listener loop has already been started. Create a new instead.");
} }
@ -165,7 +169,7 @@ public class AsyncListenerHandler {
@Override @Override
public boolean stop() throws InterruptedException { public boolean stop() throws InterruptedException {
synchronized (stopLock) { synchronized (stopLock) {
if (!running.get()) if (!isRunning())
return false; return false;
stoppedTasks.add(id); stoppedTasks.add(id);
@ -175,6 +179,7 @@ public class AsyncListenerHandler {
queuedPackets.offer(WAKEUP_PACKET); queuedPackets.offer(WAKEUP_PACKET);
} }
finished.set(true);
waitForStops(); waitForStops();
return true; return true;
} }
@ -182,7 +187,12 @@ public class AsyncListenerHandler {
@Override @Override
public boolean isRunning() { public boolean isRunning() {
return running.get(); return firstRun.get() && !finished.get();
}
@Override
public boolean isFinished() {
return finished.get();
} }
}; };
} }

6
ProtocolLib/src/com/comphenix/protocol/async/AsyncRunnable.java
View File

@ -26,4 +26,10 @@ public interface AsyncRunnable extends Runnable {
* @return TRUE if we're running, FALSE otherwise. * @return TRUE if we're running, FALSE otherwise.
*/ */
public boolean isRunning(); public boolean isRunning();
/**
* Determine if this runnable has already run its course.
* @return TRUE if it has been stopped, FALSE otherwise.
*/
boolean isFinished();
} }