From dbc1ad4cb7e512b62144d8170f9bc11a2f250178 Mon Sep 17 00:00:00 2001 From: s809 <43530948+s809@users.noreply.github.com> Date: Fri, 5 Jan 2024 22:08:37 +0500 Subject: [PATCH] Add names to network threads --- .../seibel/distanthorizons/core/network/NetworkClient.java | 3 ++- .../seibel/distanthorizons/core/network/NetworkServer.java | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/com/seibel/distanthorizons/core/network/NetworkClient.java b/core/src/main/java/com/seibel/distanthorizons/core/network/NetworkClient.java index 813ab7ca0..3db6f26dc 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/network/NetworkClient.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/network/NetworkClient.java @@ -30,6 +30,7 @@ import io.netty.bootstrap.Bootstrap; import io.netty.channel.*; import io.netty.channel.nio.NioEventLoopGroup; import io.netty.channel.socket.nio.NioSocketChannel; +import io.netty.util.concurrent.DefaultThreadFactory; import org.apache.logging.log4j.Logger; import java.net.InetSocketAddress; @@ -68,7 +69,7 @@ public class NetworkClient extends NetworkEventSource implements IConnection, Au /** Indicates whether the connection is established and first message is sent. */ public boolean isReady() { return ready; } - private final EventLoopGroup workerGroup = new NioEventLoopGroup(); + private final EventLoopGroup workerGroup = new NioEventLoopGroup(new DefaultThreadFactory("DH-Network - Client Thread")); private final Bootstrap clientBootstrap = new Bootstrap() .group(this.workerGroup) .channel(NioSocketChannel.class) diff --git a/core/src/main/java/com/seibel/distanthorizons/core/network/NetworkServer.java b/core/src/main/java/com/seibel/distanthorizons/core/network/NetworkServer.java index ab24e7516..a9a77fd55 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/network/NetworkServer.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/network/NetworkServer.java @@ -33,6 +33,7 @@ import io.netty.channel.nio.NioEventLoopGroup; import io.netty.channel.socket.nio.NioServerSocketChannel; import io.netty.handler.logging.LogLevel; import io.netty.handler.logging.LoggingHandler; +import io.netty.util.concurrent.DefaultThreadFactory; import org.apache.logging.log4j.Logger; import java.util.concurrent.ConcurrentMap; @@ -45,8 +46,8 @@ public class NetworkServer extends NetworkEventSource implements AutoCloseable // TODO move to the config private final int port; - private final EventLoopGroup bossGroup = new NioEventLoopGroup(1); - private final EventLoopGroup workerGroup = new NioEventLoopGroup(); + private final EventLoopGroup bossGroup = new NioEventLoopGroup(1, new DefaultThreadFactory("DH-Network - Server Boss Thread")); + private final EventLoopGroup workerGroup = new NioEventLoopGroup(new DefaultThreadFactory("DH-Network - Server Worker Thread")); private final AtomicBoolean isClosed = new AtomicBoolean(); private final ConcurrentMap connections = new MapMaker().weakKeys().weakValues().makeMap();