Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-01-19 06:32:03 +01:00
Code Issues Projects Releases Wiki Activity

fix deadlock

Browse Source
This commit is contained in:
Eoghanmc22 2021-04-15 14:23:18 -04:00
parent 2045ce5743
commit 1bb5c7e89b
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/net/minestom/server/thread/BatchThread.java
View File

@ -8,6 +8,7 @@ import org.jetbrains.annotations.NotNull;
import java.util.Queue;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicReference;
public class BatchThread extends Thread {
@ -46,7 +47,7 @@ public class BatchThread extends Thread {
private BatchThread batchThread;
private volatile boolean inTick;
private volatile CountDownLatch countDownLatch;
private final AtomicReference<CountDownLatch> countDownLatch = new AtomicReference<>();
private final Queue<Runnable> queue = new ConcurrentLinkedQueue<>();
@ -56,9 +57,10 @@ public class BatchThread extends Thread {
public void run() {
Check.notNull(batchThread, "The linked BatchThread cannot be null!");
while (!stop) {
CountDownLatch localCountDownLatch = this.countDownLatch.get();
// The latch is necessary to control the tick rates
if (countDownLatch == null) {
if (localCountDownLatch == null) {
if(!waitTickLock()){
break;
}
@ -79,11 +81,16 @@ public class BatchThread extends Thread {
Acquisition.processThreadTick(batchThread.getQueue());
}
this.countDownLatch.countDown();
this.countDownLatch = null;
localCountDownLatch.countDown();
boolean successful = this.countDownLatch.compareAndSet(localCountDownLatch, null);
this.inTick = false;
// new task should be available
if (!successful) {
continue;
}
// Wait for the next notify (game tick)
if(!waitTickLock()){
break;
@ -93,7 +100,7 @@ public class BatchThread extends Thread {
}
public synchronized void startTick(@NotNull CountDownLatch countDownLatch, @NotNull Runnable runnable) {
this.countDownLatch = countDownLatch;
this.countDownLatch.set(countDownLatch);
this.queue.add(runnable);
synchronized (tickLock) {
this.tickLock.notifyAll();