From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 8 Jul 2021 17:00:21 -0400 Subject: [PATCH] Better handling of async tasks Original code by Titaniumtown, licensed under GNU General Public License v3.0 You can find the original code on https://gitlab.com/Titaniumtown/JettPack diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java index e8e49e1bdf1ff4ea60a4feb6ec52d999cbced256..b49f53a89d9c096355d6cc20a2a59033f2637432 100644 --- a/src/main/java/net/minecraft/server/MCUtil.java +++ b/src/main/java/net/minecraft/server/MCUtil.java @@ -53,11 +53,14 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.BiConsumer; import java.util.function.Consumer; import java.util.function.Supplier; +import java.util.concurrent.SynchronousQueue; // Jettpack +import java.util.concurrent.ConcurrentLinkedQueue; // Jettpack public final class MCUtil { + public static final ConcurrentLinkedQueue smallAsyncTasks = new ConcurrentLinkedQueue(); // Jettpack public static final ThreadPoolExecutor asyncExecutor = new ThreadPoolExecutor( - 0, 2, 60L, TimeUnit.SECONDS, - new LinkedBlockingQueue<>(), + 4, Integer.MAX_VALUE, 60L, TimeUnit.SECONDS, // Jettpack + new SynchronousQueue(), // Jettpack new ThreadFactoryBuilder() .setNameFormat("Paper Async Task Handler Thread - %1$d") .setUncaughtExceptionHandler(new net.minecraft.DefaultUncaughtExceptionHandlerWithName(MinecraftServer.LOGGER)) @@ -74,6 +77,30 @@ public final class MCUtil { public static final long INVALID_CHUNK_KEY = getCoordinateKey(Integer.MAX_VALUE, Integer.MAX_VALUE); + // Jettpack start + public static void flushAsyncTasks() { + if (!smallAsyncTasks.isEmpty()) { + asyncExecutor.submit(() -> { + Runnable runnable; + while((runnable = (Runnable)smallAsyncTasks.poll()) != null) { + runnable.run(); + } + }); + } + } + + public static void flushAsyncTasksMidTick() { + int i = smallAsyncTasks.size() < 16 ? smallAsyncTasks.size() : 16; // if smallAsyncTasks is over size 16, only execute 16 tasks + asyncExecutor.submit(() -> { + Runnable runnable; + int i_tmp = 0; + while((runnable = (Runnable)smallAsyncTasks.poll()) != null && i_tmp != i-1) { + runnable.run(); + i_tmp += 1; + } + }); + } + // Jettpack end public static Runnable once(Runnable run) { AtomicBoolean ran = new AtomicBoolean(false); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java index 38754510081b130e045900bec6d7e0a9cb47b767..1ef00b9a0b502fac69ffdd0e233c5222dd9178ff 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1059,6 +1059,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop { + net.minecraft.server.MCUtil.asyncExecutor.execute(() -> { // Jettpack try { new LoginHandler().fireEvents(); } catch (Exception ex) { diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncScheduler.java index 9c1aff17aabd062640e3f451a2ef8c50a7c62f10..78073cbb7f36950537dc65633e264c30ee8f8a35 100644 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncScheduler.java +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncScheduler.java @@ -32,23 +32,29 @@ import java.util.Iterator; import java.util.List; import java.util.concurrent.Executor; import java.util.concurrent.Executors; +/* import java.util.concurrent.SynchronousQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; +*/ public class CraftAsyncScheduler extends CraftScheduler { + /* private final ThreadPoolExecutor executor = new ThreadPoolExecutor( 4, Integer.MAX_VALUE,30L, TimeUnit.SECONDS, new SynchronousQueue<>(), new ThreadFactoryBuilder().setNameFormat("Craft Scheduler Thread - %1$d").setUncaughtExceptionHandler(new net.minecraft.DefaultUncaughtExceptionHandlerWithName(net.minecraft.server.MinecraftServer.LOGGER)).build()); // Paper + */ private final Executor management = Executors.newSingleThreadExecutor(new ThreadFactoryBuilder() .setNameFormat("Craft Async Scheduler Management Thread").setUncaughtExceptionHandler(new net.minecraft.DefaultUncaughtExceptionHandlerWithName(net.minecraft.server.MinecraftServer.LOGGER)).build()); // Paper private final List temp = new ArrayList<>(); CraftAsyncScheduler() { super(true); + /* executor.allowCoreThreadTimeOut(true); executor.prestartAllCoreThreads(); + */ } @Override @@ -93,7 +99,7 @@ public class CraftAsyncScheduler extends CraftScheduler { private boolean executeTask(CraftTask task) { if (isValid(task)) { this.runners.put(task.getTaskId(), task); - this.executor.execute(new ServerSchedulerReportingWrapper(task)); + net.minecraft.server.MCUtil.asyncExecutor.execute(new ServerSchedulerReportingWrapper(task)); // Jettpack return true; } return false; diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java index 24fefa521093448e608e217af7b88a6397a4b054..f3400bdf23f79098c7e7b68f6b93aa65ca5b09dd 100644 --- a/src/main/java/org/spigotmc/WatchdogThread.java +++ b/src/main/java/org/spigotmc/WatchdogThread.java @@ -141,6 +141,7 @@ public class WatchdogThread extends Thread { while ( !this.stopping ) { + net.minecraft.server.MCUtil.flushAsyncTasks(); // Jettpack // // Paper start Logger log = Bukkit.getServer().getLogger();