Merge branch 'dev/1.21.3' into dev/1.21.4

RelativityMC · Nov 29, 2024 · c38da30 · c38da30
2 parents 47581f7 + d32f47f
commit c38da30
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 17 deletions.
diff --git a/FlowSched b/FlowSched
diff --git a/c2me-base/src/main/java/com/ishland/c2me/base/common/scheduler/SingleThreadExecutor.java b/c2me-base/src/main/java/com/ishland/c2me/base/common/scheduler/SingleThreadExecutor.java
@@ -28,14 +28,14 @@ public void run() {
                 return;
             }
 
-            // attempt to spin-wait before sleeping
-            if (!pollTasks()) {
-                Thread.interrupted(); // clear interrupt flag
-                for (int i = 0; i < 5000; i ++) {
-                    if (pollTasks()) continue main_loop;
-                    LockSupport.parkNanos("Spin-waiting for tasks", 10_000); // 100us
-                }
-            }
+//            // attempt to spin-wait before sleeping
+//            if (!pollTasks()) {
+//                Thread.interrupted(); // clear interrupt flag
+//                for (int i = 0; i < 5000; i ++) {
+//                    if (pollTasks()) continue main_loop;
+//                    LockSupport.parkNanos("Spin-waiting for tasks", 10_000); // 100us
+//                }
+//            }
 
             synchronized (sync) {
                 if (this.size.get() != 0 || this.shutdown.get()) continue main_loop;

diff --git a/...tes-chunkio/src/main/java/com/ishland/c2me/rewrites/chunkio/common/C2MEStorageThread.java b/...tes-chunkio/src/main/java/com/ishland/c2me/rewrites/chunkio/common/C2MEStorageThread.java
@@ -93,14 +93,14 @@ public void run() {
                     this.closeFuture.complete(null);
                     break;
                 } else {
-                    // attempt to spin-wait before sleeping
-                    if (!pollTasks()) {
-                        Thread.interrupted(); // clear interrupt flag
-                        for (int i = 0; i < 5000; i ++) {
-                            if (pollTasks() || this.closing.get()) continue main_loop;
-                            LockSupport.parkNanos("Spin-waiting for tasks", 10_000); // 100us
-                        }
-                    }
+//                    // attempt to spin-wait before sleeping
+//                    if (!pollTasks()) {
+//                        Thread.interrupted(); // clear interrupt flag
+//                        for (int i = 0; i < 5000; i ++) {
+//                            if (pollTasks() || this.closing.get()) continue main_loop;
+//                            LockSupport.parkNanos("Spin-waiting for tasks", 10_000); // 100us
+//                        }
+//                    }
                     synchronized (sync) {
                         if (this.taskSize.get() != 0 || this.closing.get()) continue main_loop;
                         try {
+8 −8		src/main/java/com/ishland/flowsched/executor/WorkerThread.java
+8 −8		src/main/java/com/ishland/flowsched/scheduler/DaemonizedStatusAdvancingScheduler.java