NanaChiyo0721
a5cd3588dc
This is generated by calude As it's only change the display, no tests and review are required
34 lines
2.5 KiB
Diff
34 lines
2.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: MrHua269 <mrhua269@gmail.com>
|
|
Date: Fri, 17 Apr 2026 22:47:34 +0800
|
|
Subject: [PATCH] Add config for cpu affinity
|
|
|
|
|
|
diff --git a/io/papermc/paper/threadedregions/TickRegionScheduler.java b/io/papermc/paper/threadedregions/TickRegionScheduler.java
|
|
index 5a72fa0d72bfdb927293abe921c57f6ae964a6ec..913161732b0affa70fb114dd4087a6102b611cba 100644
|
|
--- a/io/papermc/paper/threadedregions/TickRegionScheduler.java
|
|
+++ b/io/papermc/paper/threadedregions/TickRegionScheduler.java
|
|
@@ -66,7 +66,7 @@ public final class TickRegionScheduler {
|
|
|
|
@Override
|
|
public Thread newThread(final Runnable run) {
|
|
- final Thread ret = new TickThreadRunner(this.threadGroup, run, "Folia Region Scheduler Thread #" + this.idGenerator.getAndIncrement());
|
|
+ final Thread ret = new TickThreadRunner(this.threadGroup, moe.monnairealms.camellia.config.modules.optimizations.CpuAffinityConfig.wrapForTickRegion(run), "Folia Region Scheduler Thread #" + this.idGenerator.getAndIncrement()); // Camellia - Add config for cpu affinity
|
|
ret.setUncaughtExceptionHandler(TickRegionScheduler.this::uncaughtException);
|
|
return ret;
|
|
}
|
|
diff --git a/net/minecraft/server/network/EventLoopGroupHolder.java b/net/minecraft/server/network/EventLoopGroupHolder.java
|
|
index 9544eaee7e02d00226d957ea0b79cd1a1fb0c4d0..4e138fe36aa0bc519482990b60543b17ee2f388f 100644
|
|
--- a/net/minecraft/server/network/EventLoopGroupHolder.java
|
|
+++ b/net/minecraft/server/network/EventLoopGroupHolder.java
|
|
@@ -98,7 +98,8 @@ public abstract class EventLoopGroupHolder {
|
|
}
|
|
|
|
private ThreadFactory createThreadFactory() {
|
|
- return new ThreadFactoryBuilder().setNameFormat("Netty " + this.type + " IO #%d").setDaemon(true).setUncaughtExceptionHandler(new net.minecraft.DefaultUncaughtExceptionHandlerWithName(net.minecraft.server.MinecraftServer.LOGGER)).build(); // Paper
|
|
+ var origin = new ThreadFactoryBuilder().setNameFormat("Netty " + this.type + " IO #%d").setDaemon(true).setUncaughtExceptionHandler(new net.minecraft.DefaultUncaughtExceptionHandlerWithName(net.minecraft.server.MinecraftServer.LOGGER)).build(); // Paper // Camellia - Add config for cpu affinity
|
|
+ return run -> origin.newThread(moe.monnairealms.camellia.config.modules.optimizations.CpuAffinityConfig.wrapForNettyIo(run)); // Camellia - Add config for cpu affinity
|
|
}
|
|
|
|
protected abstract IoHandlerFactory ioHandlerFactory();
|