sen/vproxy
sen/vproxy
1
0
Fork 0
Code Issues Pull requests Activity

refactor eventlooploader

Browse source
This commit is contained in:
Sen 2025-06-05 11:28:10 +02:00
parent a966c61b0a
commit 1d1a2027e0
Signed by: sen
GPG key ID: 3AC50A6F47D1B722
4 changed files with 28 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

14
proxy/src/main/java/proxy/Proxy.java
View file

@ -58,6 +58,7 @@ import proxy.network.Direction;
import proxy.network.Decoder; import proxy.network.Decoder;
import proxy.network.Splitter; import proxy.network.Splitter;
import proxy.network.Encoder; import proxy.network.Encoder;
import proxy.network.EventLoopLoader;
import proxy.network.Prepender; import proxy.network.Prepender;
import proxy.command.*; import proxy.command.*;
import proxy.handler.HandshakeHandler; import proxy.handler.HandshakeHandler;
@ -68,17 +69,16 @@ import proxy.packet.S40PacketDisconnect;
import proxy.packet.ServerInfo; import proxy.packet.ServerInfo;
import proxy.util.Formatter; import proxy.util.Formatter;
import proxy.util.User; import proxy.util.User;
import proxy.util.LazyLoader;
import proxy.util.Log; import proxy.util.Log;
public class Proxy { public class Proxy {
public static final LazyLoader<NioEventLoopGroup> NIO_EVENT_LOOP = new LazyLoader<NioEventLoopGroup>() { public static final EventLoopLoader<NioEventLoopGroup> NIO_EVENT_LOOP = new EventLoopLoader<NioEventLoopGroup>() {
protected NioEventLoopGroup load() { protected NioEventLoopGroup createEventLoop() {
return new NioEventLoopGroup(0, (new ThreadFactoryBuilder()).setNameFormat("Netty Server IO #%d").setDaemon(true).build()); return new NioEventLoopGroup(0, (new ThreadFactoryBuilder()).setNameFormat("Netty Server IO #%d").setDaemon(true).build());
} }
}; };
public static final LazyLoader<EpollEventLoopGroup> EPOLL_EVENT_LOOP = new LazyLoader<EpollEventLoopGroup>() { public static final EventLoopLoader<EpollEventLoopGroup> EPOLL_EVENT_LOOP = new EventLoopLoader<EpollEventLoopGroup>() {
protected EpollEventLoopGroup load() { protected EpollEventLoopGroup createEventLoop() {
return new EpollEventLoopGroup(0, (new ThreadFactoryBuilder()).setNameFormat("Netty Epoll Server IO #%d").setDaemon(true).build()); return new EpollEventLoopGroup(0, (new ThreadFactoryBuilder()).setNameFormat("Netty Epoll Server IO #%d").setDaemon(true).build());
} }
}; };
@ -229,7 +229,7 @@ public class Proxy {
public void addLanEndpoint(InetAddress address, int port) throws IOException { public void addLanEndpoint(InetAddress address, int port) throws IOException {
synchronized(this.endpoints) { synchronized(this.endpoints) {
Class<? extends ServerSocketChannel> oclass; Class<? extends ServerSocketChannel> oclass;
LazyLoader<? extends EventLoopGroup> lazyloadbase; EventLoopLoader<? extends EventLoopGroup> lazyloadbase;
if(Epoll.isAvailable() && this.epoll) { if(Epoll.isAvailable() && this.epoll) {
oclass = EpollServerSocketChannel.class; oclass = EpollServerSocketChannel.class;
@ -262,7 +262,7 @@ public class Proxy {
p_initChannel_1_.pipeline().addLast((String)"packet_handler", (ChannelHandler)networkmanager); p_initChannel_1_.pipeline().addLast((String)"packet_handler", (ChannelHandler)networkmanager);
networkmanager.setNetHandler(new HandshakeHandler(Proxy.this, networkmanager)); networkmanager.setNetHandler(new HandshakeHandler(Proxy.this, networkmanager));
} }
}).group(lazyloadbase.getValue()).localAddress(address, port)).bind().syncUninterruptibly()); }).group(lazyloadbase.get()).localAddress(address, port)).bind().syncUninterruptibly());
} }
} }

13
proxy/src/main/java/proxy/network/Connection.java
View file

@ -31,22 +31,21 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder;
import proxy.handler.Handler; import proxy.handler.Handler;
import proxy.handler.Handler.ThreadQuickExitException; import proxy.handler.Handler.ThreadQuickExitException;
import proxy.util.LazyLoader;
import proxy.util.Log; import proxy.util.Log;
public class Connection extends SimpleChannelInboundHandler<Packet> public class Connection extends SimpleChannelInboundHandler<Packet>
{ {
public static final AttributeKey<Protocol> STATE = AttributeKey.<Protocol>valueOf("protocol"); public static final AttributeKey<Protocol> STATE = AttributeKey.<Protocol>valueOf("protocol");
public static final LazyLoader<NioEventLoopGroup> CLIENT_NIO_EVENTLOOP = new LazyLoader<NioEventLoopGroup>() public static final EventLoopLoader<NioEventLoopGroup> CLIENT_NIO_EVENTLOOP = new EventLoopLoader<NioEventLoopGroup>()
{ {
protected NioEventLoopGroup load() protected NioEventLoopGroup createEventLoop()
{ {
return new NioEventLoopGroup(0, (new ThreadFactoryBuilder()).setNameFormat("Netty Client IO #%d").setDaemon(true).build()); return new NioEventLoopGroup(0, (new ThreadFactoryBuilder()).setNameFormat("Netty Client IO #%d").setDaemon(true).build());
} }
}; };
public static final LazyLoader<EpollEventLoopGroup> CLIENT_EPOLL_EVENTLOOP = new LazyLoader<EpollEventLoopGroup>() public static final EventLoopLoader<EpollEventLoopGroup> CLIENT_EPOLL_EVENTLOOP = new EventLoopLoader<EpollEventLoopGroup>()
{ {
protected EpollEventLoopGroup load() protected EpollEventLoopGroup createEventLoop()
{ {
return new EpollEventLoopGroup(0, (new ThreadFactoryBuilder()).setNameFormat("Netty Epoll Client IO #%d").setDaemon(true).build()); return new EpollEventLoopGroup(0, (new ThreadFactoryBuilder()).setNameFormat("Netty Epoll Client IO #%d").setDaemon(true).build());
} }
@ -302,7 +301,7 @@ public class Connection extends SimpleChannelInboundHandler<Packet>
{ {
final Connection networkmanager = new Connection(Direction.CLIENT); final Connection networkmanager = new Connection(Direction.CLIENT);
Class <? extends SocketChannel > oclass; Class <? extends SocketChannel > oclass;
LazyLoader <? extends EventLoopGroup > lazyloadbase; EventLoopLoader <? extends EventLoopGroup > lazyloadbase;
if (Epoll.isAvailable() && useNativeTransport) if (Epoll.isAvailable() && useNativeTransport)
{ {
@ -315,7 +314,7 @@ public class Connection extends SimpleChannelInboundHandler<Packet>
lazyloadbase = CLIENT_NIO_EVENTLOOP; lazyloadbase = CLIENT_NIO_EVENTLOOP;
} }
((Bootstrap)((Bootstrap)((Bootstrap)(new Bootstrap()).group(lazyloadbase.getValue())).handler(new ChannelInitializer<Channel>() ((Bootstrap)((Bootstrap)((Bootstrap)(new Bootstrap()).group(lazyloadbase.get())).handler(new ChannelInitializer<Channel>()
{ {
protected void initChannel(Channel p_initChannel_1_) throws Exception protected void initChannel(Channel p_initChannel_1_) throws Exception
{ {

15
proxy/src/main/java/proxy/network/EventLoopLoader.java Executable file
View file

@ -0,0 +1,15 @@
package proxy.network;
import io.netty.channel.EventLoopGroup;
public abstract class EventLoopLoader<T extends EventLoopGroup> {
private T group;
public T get() {
if(this.group == null)
this.group = this.createEventLoop();
return this.group;
}
protected abstract T createEventLoop();
}

18
proxy/src/main/java/proxy/util/LazyLoader.java
View file

@ -1,18 +0,0 @@
package proxy.util;
import io.netty.channel.EventLoopGroup;
public abstract class LazyLoader<T extends EventLoopGroup> {
private T value;
private boolean isLoaded = false;
public T getValue() {
if(!this.isLoaded) {
this.isLoaded = true;
this.value = this.load();
}
return this.value;
}
protected abstract T load();
}