Repo-Mirror/Gale
9
0
Fork 0
mirror of https://github.com/Dreeam-qwq/Gale.git synced 2025-12-28 02:59:12 +00:00
Code Issues Releases Activity

Check for timeout in sub-task loop

Browse Source
This commit is contained in:
Martijn Muijsers
2023-02-06 19:40:20 +01:00
parent f46c4f05d8
commit 25e9f8a3c5
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
patches/server/0148-Base-thread-pool.patch
View File

@@ -4427,10 +4427,10 @@ index 0000000000000000000000000000000000000000..eab769d7319f26db1f4db9599a3c263c
+}
diff --git a/src/main/java/org/galemc/gale/executor/thread/BaseThread.java b/src/main/java/org/galemc/gale/executor/thread/BaseThread.java
new file mode 100644
index 0000000000000000000000000000000000000000..17ae524053949073fcdcbccc53327c42ba1903c6
index 0000000000000000000000000000000000000000..f0bf8cfc28107d3f2421d033e45f1a88f8d86d5b
--- /dev/null
+++ b/src/main/java/org/galemc/gale/executor/thread/BaseThread.java
@@ -0,0 +1,722 @@
@@ -0,0 +1,725 @@
+// Gale - base thread pool
+
+package org.galemc.gale.executor.thread;
@@ -4715,6 +4715,9 @@ index 0000000000000000000000000000000000000000..17ae524053949073fcdcbccc53327c42
+ to be released.
+ */
+ while (true) {
+ if (timeoutTime != null && System.nanoTime() - timeoutTime >= 0) {
+ break;
+ }
+ if (stopCondition != null) {
+ if (this == MinecraftServer.serverThread) {
+ MinecraftServer.currentManagedBlockStopConditionHasBecomeTrue = false;

4
patches/server/0161-Run-chunk-worker-tasks-on-base-thread-pool.patch
View File

@@ -653,7 +653,7 @@ index 0000000000000000000000000000000000000000..9c36119b03ba9a20dc6994ef2d2704eb
+
+}
diff --git a/src/main/java/org/galemc/gale/executor/thread/BaseThread.java b/src/main/java/org/galemc/gale/executor/thread/BaseThread.java
index 17ae524053949073fcdcbccc53327c42ba1903c6..a01ce790927ff79071c582ca84d64207fd850dfa 100644
index f0bf8cfc28107d3f2421d033e45f1a88f8d86d5b..3e293dbd4ea8336a6239df6ee60bff9ddd6a33d3 100644
--- a/src/main/java/org/galemc/gale/executor/thread/BaseThread.java
+++ b/src/main/java/org/galemc/gale/executor/thread/BaseThread.java
@@ -2,6 +2,8 @@
@@ -673,7 +673,7 @@ index 17ae524053949073fcdcbccc53327c42ba1903c6..a01ce790927ff79071c582ca84d64207
import org.jetbrains.annotations.Nullable;
import java.util.concurrent.TimeUnit;
@@ -699,6 +702,20 @@ public abstract class BaseThread extends Thread implements AbstractYieldingThrea
@@ -702,6 +705,20 @@ public abstract class BaseThread extends Thread implements AbstractYieldingThrea
}
}