mirror of
https://github.com/BX-Team/DivineMC.git
synced 2025-12-19 14:59:25 +00:00
60 lines
3.3 KiB
Diff
60 lines
3.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com>
|
|
Date: Mon, 24 Feb 2025 19:36:33 +0300
|
|
Subject: [PATCH] Virtual Threads
|
|
|
|
|
|
diff --git a/src/main/java/io/papermc/paper/util/MCUtil.java b/src/main/java/io/papermc/paper/util/MCUtil.java
|
|
index 8756aedc6943f80a64e89be36f4cce0fd0348a0f..2ebaed19ced1901d2d849cbd2351a75ca854e1c8 100644
|
|
--- a/src/main/java/io/papermc/paper/util/MCUtil.java
|
|
+++ b/src/main/java/io/papermc/paper/util/MCUtil.java
|
|
@@ -37,7 +37,7 @@ public final class MCUtil {
|
|
run.run();
|
|
}
|
|
};
|
|
- public static final ExecutorService ASYNC_EXECUTOR = Executors.newFixedThreadPool(2, new ThreadFactoryBuilder()
|
|
+ public static final ExecutorService ASYNC_EXECUTOR = org.bxteam.divinemc.DivineConfig.virtualThreadsEnabled && org.bxteam.divinemc.DivineConfig.virtualAsyncExecutor ? Executors.newVirtualThreadPerTaskExecutor() : Executors.newFixedThreadPool(2, new ThreadFactoryBuilder() // DivineMC - Virtual Threads
|
|
.setNameFormat("Paper Async Task Handler Thread - %1$d")
|
|
.setUncaughtExceptionHandler(new net.minecraft.DefaultUncaughtExceptionHandlerWithName(MinecraftServer.LOGGER))
|
|
.build()
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncScheduler.java
|
|
index 0ca279fb71d39c81b1f608e0ee9ba3e498d55fa3..bfa84901c5e0e50ab3f713293035aefbcf4488e6 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncScheduler.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncScheduler.java
|
|
@@ -31,14 +31,18 @@ import java.util.ArrayList;
|
|
import java.util.Iterator;
|
|
import java.util.List;
|
|
import java.util.concurrent.Executor;
|
|
+import java.util.concurrent.ExecutorService;
|
|
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(
|
|
+ // DivineMC start - Virtual Threads
|
|
+ private final ExecutorService executor = org.bxteam.divinemc.DivineConfig.virtualThreadsEnabled && org.bxteam.divinemc.DivineConfig.virtualBukkitScheduler
|
|
+ ? Executors.newVirtualThreadPerTaskExecutor()
|
|
+ : new ThreadPoolExecutor(
|
|
+ // DivineMC end - Virtual Threads
|
|
4, Integer.MAX_VALUE,30L, TimeUnit.SECONDS, new SynchronousQueue<>(),
|
|
new ThreadFactoryBuilder().setNameFormat("Craft Scheduler Thread - %1$d").build());
|
|
private final Executor management = Executors.newSingleThreadExecutor(new ThreadFactoryBuilder()
|
|
@@ -47,8 +51,12 @@ public class CraftAsyncScheduler extends CraftScheduler {
|
|
|
|
CraftAsyncScheduler() {
|
|
super(true);
|
|
- executor.allowCoreThreadTimeOut(true);
|
|
- executor.prestartAllCoreThreads();
|
|
+ // DivineMC start - Virtual Threads
|
|
+ if (!org.bxteam.divinemc.DivineConfig.virtualThreadsEnabled && !org.bxteam.divinemc.DivineConfig.virtualBukkitScheduler) {
|
|
+ ((ThreadPoolExecutor) executor).allowCoreThreadTimeOut(true);
|
|
+ ((ThreadPoolExecutor) executor).prestartAllCoreThreads();
|
|
+ }
|
|
+ // DivineMC end - Virtual Threads
|
|
}
|
|
|
|
@Override
|