103 lines
4.0 KiB
Diff
103 lines
4.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Simon Gardling <titaniumtown@gmail.com>
|
|
Date: Thu, 8 Jul 2021 15:03:15 -0400
|
|
Subject: [PATCH] Use LinkedBlockingDeque in IAsyncTaskHandler
|
|
|
|
Original license: GPLv3
|
|
Original project: https://gitlab.com/Titaniumtown/JettPack
|
|
|
|
diff --git a/src/main/java/net/minecraft/util/thread/BlockableEventLoop.java b/src/main/java/net/minecraft/util/thread/BlockableEventLoop.java
|
|
index 8bf10c68c233a445902a143eaeb5252247c74a75..dd7c85b6d94e5d2397d4ac28d796048590888216 100644
|
|
--- a/src/main/java/net/minecraft/util/thread/BlockableEventLoop.java
|
|
+++ b/src/main/java/net/minecraft/util/thread/BlockableEventLoop.java
|
|
@@ -1,13 +1,13 @@
|
|
package net.minecraft.util.thread;
|
|
|
|
import com.google.common.collect.ImmutableList;
|
|
-import com.google.common.collect.Queues;
|
|
+//import com.google.common.collect.Queues; // JettPack
|
|
import com.mojang.logging.LogUtils;
|
|
import java.util.List;
|
|
-import java.util.Queue;
|
|
+//import java.util.Queue; // JettPack
|
|
import java.util.concurrent.CompletableFuture;
|
|
import java.util.concurrent.Executor;
|
|
-import java.util.concurrent.locks.LockSupport;
|
|
+//import java.util.concurrent.locks.LockSupport; // JettPack
|
|
import java.util.function.BooleanSupplier;
|
|
import java.util.function.Supplier;
|
|
import net.minecraft.util.profiling.metrics.MetricCategory;
|
|
@@ -15,12 +15,15 @@ import net.minecraft.util.profiling.metrics.MetricSampler;
|
|
import net.minecraft.util.profiling.metrics.MetricsRegistry;
|
|
import net.minecraft.util.profiling.metrics.ProfilerMeasured;
|
|
import org.slf4j.Logger;
|
|
+import java.util.concurrent.LinkedBlockingDeque; // JettPack
|
|
+import java.util.concurrent.TimeUnit; // JettPack
|
|
|
|
public abstract class BlockableEventLoop<R extends Runnable> implements ProfilerMeasured, ProcessorHandle<R>, Executor {
|
|
private final String name;
|
|
private static final Logger LOGGER = LogUtils.getLogger();
|
|
- private final Queue<R> pendingRunnables = Queues.newConcurrentLinkedQueue();
|
|
+ private final LinkedBlockingDeque<R> pendingRunnables = new LinkedBlockingDeque(); // JettPack
|
|
private int blockingCount;
|
|
+ private R next = null; // JettPack
|
|
|
|
protected BlockableEventLoop(String name) {
|
|
this.name = name;
|
|
@@ -89,7 +92,7 @@ public abstract class BlockableEventLoop<R extends Runnable> implements Profiler
|
|
@Override
|
|
public void tell(R runnable) {
|
|
this.pendingRunnables.add(runnable);
|
|
- LockSupport.unpark(this.getRunningThread());
|
|
+ //LockSupport.unpark(this.getRunningThread()); // JettPack
|
|
}
|
|
|
|
@Override
|
|
@@ -117,15 +120,20 @@ public abstract class BlockableEventLoop<R extends Runnable> implements Profiler
|
|
}
|
|
|
|
public boolean pollTask() {
|
|
- R runnable = this.pendingRunnables.peek();
|
|
- if (runnable == null) {
|
|
- return false;
|
|
- } else if (this.blockingCount == 0 && !true/*this.shouldRun(runnable)*/) { // Patina
|
|
+ // JettPack start
|
|
+ if (this.next == null && !this.pendingRunnables.isEmpty()) {
|
|
+ this.waitForTasks();
|
|
+ }
|
|
+
|
|
+ if (this.next == null) {
|
|
return false;
|
|
} else {
|
|
- this.doRunTask(this.pendingRunnables.remove());
|
|
+ R r2 = this.next;
|
|
+ this.next = null;
|
|
+ this.doRunTask(r2);
|
|
return true;
|
|
}
|
|
+ // JettPack end
|
|
}
|
|
|
|
public void managedBlock(BooleanSupplier stopCondition) {
|
|
@@ -144,8 +152,18 @@ public abstract class BlockableEventLoop<R extends Runnable> implements Profiler
|
|
}
|
|
|
|
protected void waitForTasks() {
|
|
- Thread.yield();
|
|
- LockSupport.parkNanos("waiting for tasks", 100000L);
|
|
+ // JettPack start
|
|
+ if (this.next != null) {
|
|
+ throw new IllegalStateException("next != null");
|
|
+ }
|
|
+ try {
|
|
+ this.next = this.pendingRunnables.poll(100L, TimeUnit.MICROSECONDS);
|
|
+ return;
|
|
+ }
|
|
+ catch (InterruptedException interruptedException) {
|
|
+ return;
|
|
+ }
|
|
+ // JettPack end
|
|
}
|
|
|
|
protected void doRunTask(R task) {
|