mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix isCurrentlyRunning for sync tasks

Browse source 
Not sure where this would of ever been used, but for correctness sake.
This commit is contained in:
Aikar 2018-03-17 13:14:44 -04:00
parent 26b1519733
commit 09d1277482
No known key found for this signature in database
GPG key ID: 401ADFC9891FAAFE
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
Spigot-Server-Patches/0275-Improved-Async-Task-Scheduler.patch
View file

@ -1,4 +1,4 @@
From 2b304a51b4e740aaab398d6bd31f54da4486ef81 Mon Sep 17 00:00:00 2001 From a02abf4be83eadada6f4e91795711a06cee84905 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Fri, 16 Mar 2018 22:59:43 -0400 Date: Fri, 16 Mar 2018 22:59:43 -0400
Subject: [PATCH] Improved Async Task Scheduler Subject: [PATCH] Improved Async Task Scheduler
@ -204,7 +204,7 @@ index 000000000..cf5aada2f
+ } + }
+} +}
diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
index e47f4cca2..4a4159879 100644 index e47f4cca2..c3cb9e6d2 100644
--- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
+++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
@@ -15,7 +15,6 @@ import java.util.concurrent.atomic.AtomicReference; @@ -15,7 +15,6 @@ import java.util.concurrent.atomic.AtomicReference;
@ -306,19 +306,21 @@ index e47f4cca2..4a4159879 100644
final CraftTask task = new CraftTask( final CraftTask task = new CraftTask(
new Runnable() { new Runnable() {
public void run() { public void run() {
@@ -272,6 +303,11 @@ public class CraftScheduler implements BukkitScheduler { @@ -272,6 +303,13 @@ public class CraftScheduler implements BukkitScheduler {
} }
public boolean isCurrentlyRunning(final int taskId) { public boolean isCurrentlyRunning(final int taskId) {
+ // Paper start + // Paper start
+ if (!isAsyncScheduler) { //noinspection TailRecursion + if (!isAsyncScheduler) {
+ return this.asyncScheduler.isCurrentlyRunning(taskId); + if (this.asyncScheduler.isCurrentlyRunning(taskId)) {
+ return true;
+ }
+ } + }
+ // Paper end + // Paper end
final CraftTask task = runners.get(taskId); final CraftTask task = runners.get(taskId);
if (task == null || task.isSync()) { if (task == null || task.isSync()) {
return false; return false;
@@ -286,6 +322,11 @@ public class CraftScheduler implements BukkitScheduler { @@ -286,6 +324,11 @@ public class CraftScheduler implements BukkitScheduler {
if (taskId <= 0) { if (taskId <= 0) {
return false; return false;
} }
@ -330,7 +332,7 @@ index e47f4cca2..4a4159879 100644
for (CraftTask task = head.getNext(); task != null; task = task.getNext()) { for (CraftTask task = head.getNext(); task != null; task = task.getNext()) {
if (task.getTaskId() == taskId) { if (task.getTaskId() == taskId) {
return task.getPeriod() >= -1l; // The task will run return task.getPeriod() >= -1l; // The task will run
@@ -296,6 +337,12 @@ public class CraftScheduler implements BukkitScheduler { @@ -296,6 +339,12 @@ public class CraftScheduler implements BukkitScheduler {
} }
public List<BukkitWorker> getActiveWorkers() { public List<BukkitWorker> getActiveWorkers() {
@ -343,7 +345,7 @@ index e47f4cca2..4a4159879 100644
final ArrayList<BukkitWorker> workers = new ArrayList<BukkitWorker>(); final ArrayList<BukkitWorker> workers = new ArrayList<BukkitWorker>();
for (final CraftTask taskObj : runners.values()) { for (final CraftTask taskObj : runners.values()) {
// Iterator will be a best-effort (may fail to grab very new values) if called from an async thread // Iterator will be a best-effort (may fail to grab very new values) if called from an async thread
@@ -332,6 +379,11 @@ public class CraftScheduler implements BukkitScheduler { @@ -332,6 +381,11 @@ public class CraftScheduler implements BukkitScheduler {
pending.add(task); pending.add(task);
} }
} }
@ -355,7 +357,7 @@ index e47f4cca2..4a4159879 100644
return pending; return pending;
} }
@@ -339,6 +391,11 @@ public class CraftScheduler implements BukkitScheduler { @@ -339,6 +393,11 @@ public class CraftScheduler implements BukkitScheduler {
* This method is designed to never block or wait for locks; an immediate execution of all current tasks. * This method is designed to never block or wait for locks; an immediate execution of all current tasks.
*/ */
public void mainThreadHeartbeat(final int currentTick) { public void mainThreadHeartbeat(final int currentTick) {
@ -367,7 +369,7 @@ index e47f4cca2..4a4159879 100644
this.currentTick = currentTick; this.currentTick = currentTick;
final List<CraftTask> temp = this.temp; final List<CraftTask> temp = this.temp;
parsePending(); parsePending();
@@ -372,7 +429,7 @@ public class CraftScheduler implements BukkitScheduler { @@ -372,7 +431,7 @@ public class CraftScheduler implements BukkitScheduler {
parsePending(); parsePending();
} else { } else {
//debugTail = debugTail.setNext(new CraftAsyncDebugger(currentTick + RECENT_TICKS, task.getOwner(), task.getTaskClass())); // Paper //debugTail = debugTail.setNext(new CraftAsyncDebugger(currentTick + RECENT_TICKS, task.getOwner(), task.getTaskClass())); // Paper
@ -376,7 +378,7 @@ index e47f4cca2..4a4159879 100644
// We don't need to parse pending // We don't need to parse pending
// (async tasks must live with race-conditions if they attempt to cancel between these few lines of code) // (async tasks must live with race-conditions if they attempt to cancel between these few lines of code)
} }
@@ -400,7 +457,13 @@ public class CraftScheduler implements BukkitScheduler { @@ -400,7 +459,13 @@ public class CraftScheduler implements BukkitScheduler {
tailTask.setNext(task); tailTask.setNext(task);
} }