Repo-Mirror/Leaf
9
0
Fork 0
mirror of https://github.com/Winds-Studio/Leaf.git synced 2025-12-27 02:49:19 +00:00
Code Issues Releases Activity

Bump netty to 4.2.4 & Add io_uring, kqueue support (#449)

Browse Source 
* Bump netty to 4.2.3

* Upload config

* Update config comments

* Fix model detection

* Switch to system properties

* kqueue support

* Bump to latest

* Fix build

---------

Co-authored-by: HaHaWTH <102713261+HaHaWTH@users.noreply.github.com>
This commit is contained in:
Dreeam
2025-08-15 02:50:29 +08:00
committed by GitHub
parent a1b39f41d6
commit 2d75f3e529
4 changed files with 245 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
leaf-server/build.gradle.kts.patch
View File

@@ -108,7 +108,7 @@
- implementation("io.netty:netty-codec-haproxy:4.1.118.Final") // Add support for proxy protocol
- implementation("org.apache.logging.log4j:log4j-iostreams:2.24.1")
+ // Leaf start - Bump Dependencies
+ implementation("io.netty:netty-codec-haproxy:4.1.119.Final") // Add support for proxy protocol
+ implementation("io.netty:netty-codec-haproxy:4.2.4.Final") // Add support for proxy protocol // Leaf - Bump netty to 4.2.x
+ implementation("org.apache.logging.log4j:log4j-iostreams:2.24.3")
+ // Leaf end - Bump Dependencies
implementation("org.ow2.asm:asm-commons:9.8")
@@ -164,7 +164,7 @@
+ implementation("me.lucko:spark-api:0.1-dev-f0b5206-SNAPSHOT")
+ implementation("me.lucko:spark-paper:1.10-dev-f0b5206-SNAPSHOT")
+
+ implementation("io.netty:netty-all:4.1.119.Final") // Dreeam TODO - Update to 4.2.0
+ implementation("io.netty:netty-all:4.2.4.Final") // Leaf - Bump netty to 4.2.x
+ // Leaf end - Bump Dependencies
+}
+

174
leaf-server/minecraft-patches/features/0281-Bump-netty-to-4.2.x.patch Normal file
View File

@@ -0,0 +1,174 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com>
Date: Thu, 7 Aug 2025 00:22:50 +0800
Subject: [PATCH] Bump netty to 4.2.x
diff --git a/net/minecraft/gametest/framework/GameTestServer.java b/net/minecraft/gametest/framework/GameTestServer.java
index 340d5487fa778277b9560250271c5143d80d9987..99543330da85ddecd91c954c8aa386c89a96c23f 100644
--- a/net/minecraft/gametest/framework/GameTestServer.java
+++ b/net/minecraft/gametest/framework/GameTestServer.java
@@ -333,6 +333,18 @@ public class GameTestServer extends MinecraftServer {
return false;
}
+ // Leaf start - Bump netty to 4.2.x
+ @Override
+ public boolean isIoUringEnabled() {
+ return false;
+ }
+
+ @Override
+ public boolean isKqueueEnabled() {
+ return false;
+ }
+ // Leaf end - Bump netty to 4.2.x
+
@Override
public boolean isCommandBlockEnabled() {
return true;
diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
index 7849a905db35377da0931aa1c9b8770f30a51044..463f3d5334df16234c1794dd8c7bbea56cb87f70 100644
--- a/net/minecraft/server/MinecraftServer.java
+++ b/net/minecraft/server/MinecraftServer.java
@@ -2064,6 +2064,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
public abstract boolean isEpollEnabled();
+ // Leaf start - Bump netty to 4.2.x
+ public abstract boolean isIoUringEnabled();
+
+ public abstract boolean isKqueueEnabled();
+ // Leaf end - Bump netty to 4.2.x
+
public boolean isPvpAllowed() {
return this.pvp;
}
diff --git a/net/minecraft/server/dedicated/DedicatedServer.java b/net/minecraft/server/dedicated/DedicatedServer.java
index 463a9d9b15301e7139bd36435214662aa3ccf63d..7c3a376f6b055fa80a68e0909aa5e59d3d7a0388 100644
--- a/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/net/minecraft/server/dedicated/DedicatedServer.java
@@ -510,9 +510,21 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@Override
public boolean isEpollEnabled() {
- return this.getProperties().useNativeTransport;
+ return this.getProperties().useNativeTransport && org.dreeam.leaf.NetworkIoModel.fromProperty() == org.dreeam.leaf.NetworkIoModel.EPOLL; // Leaf - Bump netty to 4.2.x
}
+ // Leaf start - Bump netty to 4.2.x
+ @Override
+ public boolean isIoUringEnabled() {
+ return this.getProperties().useNativeTransport && org.dreeam.leaf.NetworkIoModel.fromProperty() == org.dreeam.leaf.NetworkIoModel.IO_URING;
+ }
+
+ @Override
+ public boolean isKqueueEnabled() {
+ return this.getProperties().useNativeTransport && org.dreeam.leaf.NetworkIoModel.fromProperty() == org.dreeam.leaf.NetworkIoModel.KQUEUE;
+ }
+ // Leaf end - Bump netty to 4.2.x
+
@Override
public DedicatedPlayerList getPlayerList() {
return (DedicatedPlayerList)super.getPlayerList();
diff --git a/net/minecraft/server/network/ServerConnectionListener.java b/net/minecraft/server/network/ServerConnectionListener.java
index bd07e6a5aa1883786d789ea71711a0c0c0a95c26..ea5dfaa2efaccd643f9977cb60d982791439a597 100644
--- a/net/minecraft/server/network/ServerConnectionListener.java
+++ b/net/minecraft/server/network/ServerConnectionListener.java
@@ -48,12 +48,20 @@ import org.slf4j.Logger;
public class ServerConnectionListener {
private static final Logger LOGGER = LogUtils.getLogger();
+ // Leaf start - Bump netty to 4.2.x
+ /*
public static final Supplier<NioEventLoopGroup> SERVER_EVENT_GROUP = Suppliers.memoize(
() -> new NioEventLoopGroup(0, new ThreadFactoryBuilder().setNameFormat("Netty Server IO #%d").setDaemon(true).setUncaughtExceptionHandler(new net.minecraft.DefaultUncaughtExceptionHandlerWithName(LOGGER)).build()) // Paper
);
public static final Supplier<EpollEventLoopGroup> SERVER_EPOLL_EVENT_GROUP = Suppliers.memoize(
() -> new EpollEventLoopGroup(0, new ThreadFactoryBuilder().setNameFormat("Netty Epoll Server IO #%d").setDaemon(true).setUncaughtExceptionHandler(new net.minecraft.DefaultUncaughtExceptionHandlerWithName(LOGGER)).build()) // Paper
);
+ */
+ public static final Supplier<io.netty.channel.IoHandlerFactory> NIO_IO_HANDLE_FACTORY = io.netty.channel.nio.NioIoHandler::newFactory;
+ public static final Supplier<io.netty.channel.IoHandlerFactory> EPOLL_IO_HANDLE_FACTORY = io.netty.channel.epoll.EpollIoHandler::newFactory;
+ public static final Supplier<io.netty.channel.IoHandlerFactory> IO_URING_IO_HANDLE_FACTORY = io.netty.channel.uring.IoUringIoHandler::newFactory;
+ public static final Supplier<io.netty.channel.IoHandlerFactory> KQUEUE_IO_HANDLE_FACTORY = io.netty.channel.kqueue.KQueueIoHandler::newFactory;
+ // Leaf end - Bump netty to 4.2.x
final MinecraftServer server;
public volatile boolean running;
private final List<ChannelFuture> channels = Collections.synchronizedList(Lists.newArrayList());
@@ -87,7 +95,29 @@ public class ServerConnectionListener {
synchronized (this.channels) {
Class<? extends io.netty.channel.ServerChannel> clazz; // Paper - Unix domain socket support
EventLoopGroup eventLoopGroup;
- if (Epoll.isAvailable() && this.server.isEpollEnabled()) {
+ // Leaf start - Bump netty to 4.2.x
+ if (io.netty.channel.uring.IoUring.isAvailable() && this.server.isIoUringEnabled()) {
+ // Paper start - Unix domain socket support
+ if (address instanceof io.netty.channel.unix.DomainSocketAddress) {
+ clazz = io.netty.channel.uring.IoUringServerDomainSocketChannel.class;
+ } else {
+ clazz = io.netty.channel.uring.IoUringServerSocketChannel.class;
+ }
+ // Paper end - Unix domain socket supp
+ eventLoopGroup = createEventLoopGroup("IoUring", IO_URING_IO_HANDLE_FACTORY);
+ LOGGER.info("Using io_uring channel type");
+ } else if (io.netty.channel.kqueue.KQueue.isAvailable() && this.server.isKqueueEnabled()) {
+ // Paper start - Unix domain socket support
+ if (address instanceof io.netty.channel.unix.DomainSocketAddress) {
+ clazz = io.netty.channel.kqueue.KQueueServerDomainSocketChannel.class;
+ } else {
+ clazz = io.netty.channel.kqueue.KQueueServerSocketChannel.class;
+ }
+ // Paper end - Unix domain socket support
+ eventLoopGroup = createEventLoopGroup("Kqueue", KQUEUE_IO_HANDLE_FACTORY);
+ LOGGER.info("Using kqueue channel type");
+ } else if (Epoll.isAvailable() && this.server.isEpollEnabled()) {
+ // Leaf end - Bump netty to 4.2.x
// Paper start - Unix domain socket support
if (address instanceof io.netty.channel.unix.DomainSocketAddress) {
clazz = io.netty.channel.epoll.EpollServerDomainSocketChannel.class;
@@ -95,12 +125,12 @@ public class ServerConnectionListener {
clazz = EpollServerSocketChannel.class;
}
// Paper end - Unix domain socket support
- eventLoopGroup = SERVER_EPOLL_EVENT_GROUP.get();
+ eventLoopGroup = createEventLoopGroup("Epoll", EPOLL_IO_HANDLE_FACTORY); // Leaf - Bump netty to 4.2.x
LOGGER.info("Using epoll channel type");
} else {
clazz = NioServerSocketChannel.class;
- eventLoopGroup = SERVER_EVENT_GROUP.get();
- LOGGER.info("Using default channel type");
+ eventLoopGroup = createEventLoopGroup("Nio", NIO_IO_HANDLE_FACTORY); // Leaf - Bump netty to 4.2.x
+ LOGGER.info("Using default nio channel type"); // Leaf - Bump netty to 4.2.x
}
// Paper start - Warn people with console access that HAProxy is in use.
@@ -195,6 +225,19 @@ public class ServerConnectionListener {
}
// CraftBukkit end
+ // Leaf start - Bump netty to 4.2.x
+ public EventLoopGroup createEventLoopGroup(final String name, final Supplier<io.netty.channel.IoHandlerFactory> ioHandlerFactorySupplier) {
+ return new io.netty.channel.MultiThreadIoEventLoopGroup(
+ 0,
+ new ThreadFactoryBuilder().setNameFormat("Netty " + name + " Server IO #%d")
+ .setDaemon(true)
+ .setUncaughtExceptionHandler(new net.minecraft.DefaultUncaughtExceptionHandlerWithName(LOGGER))
+ .build(),
+ ioHandlerFactorySupplier.get()
+ );
+ }
+ // Leaf end - Bump netty to 4.2.x
+
public SocketAddress startMemoryChannel() {
ChannelFuture channelFuture;
synchronized (this.channels) {
@@ -215,7 +258,7 @@ public class ServerConnectionListener {
}
}
)
- .group(SERVER_EVENT_GROUP.get())
+ //.group(SERVER_EVENT_GROUP.get()) // Leaf - Bump netty to 4.2.x - not used, comment
.localAddress(LocalAddress.ANY)
.bind()
.syncUninterruptibly();

25
leaf-server/paper-patches/features/0063-Bump-netty-to-4.2.x.patch Normal file
View File

@@ -0,0 +1,25 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com>
Date: Thu, 7 Aug 2025 00:22:50 +0800
Subject: [PATCH] Bump netty to 4.2.x
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index 748bd9650da4a209743b7a5dde584b2e19c5a578..3e972dc2160f953daaa727c2305ec71eed7981a5 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -21,6 +21,14 @@ public class Main {
// Paper start - Reset loggers after shutdown
static {
System.setProperty("java.util.logging.manager", "io.papermc.paper.log.CustomLogManager");
+
+ // Leaf start - Bump netty to 4.2.x
+ // Fallback to original pooled allocator if no explicitly define adaptive allocator
+ // To follow https://github.com/netty/netty/wiki/Netty-4.2-Migration-Guide
+ if (System.getProperty("io.netty.allocator.type") == null) {
+ System.setProperty("io.netty.allocator.type", "pooled");
+ }
+ // Leaf end - Bump netty to 4.2.x
}
// Paper end - Reset loggers after shutdown

44
leaf-server/src/main/java/org/dreeam/leaf/NetworkIoModel.java Normal file
View File

@@ -0,0 +1,44 @@
// Leaf - Bump netty to 4.2.x
package org.dreeam.leaf;
import java.util.Locale;
public enum NetworkIoModel {
IO_URING("io_uring"),
KQUEUE("kqueue"),
EPOLL("epoll"),
NIO("nio");
private final String name;
NetworkIoModel(String name) {
this.name = name;
}
public String getName() {
return this.name;
}
public static NetworkIoModel fromName(String name) {
if (name == null) return EPOLL;
return switch (name.toLowerCase(Locale.ROOT)) {
case "io_uring" -> IO_URING;
case "kqueue" -> KQUEUE;
case "epoll" -> EPOLL;
default -> NIO;
};
}
public static NetworkIoModel fromProperty() {
final String name = System.getProperty("Leaf.native-transport-type");
if (name == null) return EPOLL;
return switch (name.toLowerCase(Locale.ROOT)) {
case "io_uring" -> IO_URING;
case "kqueue" -> KQUEUE;
case "epoll" -> EPOLL;
default -> NIO;
};
}
}