PandacubeFr/BungeeCord
1
0
Fork 0
Code Releases Activity

Update to netty CR3

Browse Source
This commit is contained in:
md_5 2013-05-21 11:30:05 +10:00
parent 2a2c2717d5
commit 9be44d51a6
5 changed files with 7 additions and 187 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -59,7 +59,7 @@
<properties>
<build.number>unknown</build.number>
<netty.version>4.0.0.CR1</netty.version>
<netty.version>4.0.0.CR3</netty.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

4
proxy/src/main/java/net/md_5/bungee/BungeeCord.java
View File

@ -84,7 +84,7 @@ public class BungeeCord extends ProxyServer
* Thread pools.
*/
public final ScheduledThreadPoolExecutor executors = new BungeeThreadPool( new ThreadFactoryBuilder().setNameFormat( "Bungee Pool Thread #%1$d" ).build() );
public final MultithreadEventLoopGroup eventLoops = new NioEventLoopGroup( 0, new ThreadFactoryBuilder().setNameFormat( "Netty IO Thread #%1$d" ).build() );
public final MultithreadEventLoopGroup eventLoops = new NioEventLoopGroup( NioEventLoopGroup.DEFAULT_EVENT_LOOP_THREADS, new ThreadFactoryBuilder().setNameFormat( "Netty IO Thread #%1$d" ).build() );
/**
* locations.yml save thread.
*/
@ -282,7 +282,7 @@ public class BungeeCord extends ProxyServer
}
getLogger().info( "Closing IO threads" );
eventLoops.shutdown();
eventLoops.shutdownGracefully();
getLogger().info( "Saving reconnect locations" );
reconnectHandler.save();

4
proxy/src/main/java/net/md_5/bungee/netty/ChannelWrapper.java
View File

@ -6,17 +6,15 @@ public class ChannelWrapper
{
private final Channel ch;
private final ReusableChannelPromise promise;
public ChannelWrapper(Channel ch)
{
this.ch = ch;
this.promise = new ReusableChannelPromise( ch );
}
public void write(Object packet)
{
ch.write( packet, promise );
ch.write( packet, ch.voidPromise() );
}
public Channel getHandle()

5
proxy/src/main/java/net/md_5/bungee/netty/PacketDecoder.java
View File

@ -1,6 +1,7 @@
package net.md_5.bungee.netty;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.MessageBuf;
import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.ReplayingDecoder;
import lombok.AllArgsConstructor;
@ -25,7 +26,7 @@ public class PacketDecoder extends ReplayingDecoder<Void>
private int protocol;
@Override
protected byte[] decode(ChannelHandlerContext ctx, ByteBuf in) throws Exception
protected void decode(ChannelHandlerContext ctx, ByteBuf in, MessageBuf<Object> out) throws Exception
{
// While we have enough data
while ( true )
@ -47,7 +48,7 @@ public class PacketDecoder extends ReplayingDecoder<Void>
// Checkpoint our state incase we don't have enough data for another packet
checkpoint();
// Store our decoded message
return buf;
out.add( buf );
}
}
}

179
proxy/src/main/java/net/md_5/bungee/netty/ReusableChannelPromise.java
View File

@ -1,179 +0,0 @@
package net.md_5.bungee.netty;
import io.netty.channel.Channel;
import io.netty.channel.ChannelPromise;
import io.netty.util.concurrent.Future;
import io.netty.util.concurrent.GenericFutureListener;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import lombok.RequiredArgsConstructor;
@RequiredArgsConstructor
public class ReusableChannelPromise implements ChannelPromise
{
private final Channel ch;
@Override
public Channel channel()
{
return ch;
}
@Override
public ChannelPromise setSuccess(Void result)
{
throw new UnsupportedOperationException( "Not supported yet." );
}
@Override
public ChannelPromise setSuccess()
{
return this;
}
@Override
public boolean trySuccess()
{
throw new UnsupportedOperationException( "Not supported yet." );
}
@Override
public ChannelPromise setFailure(Throwable cause)
{
return this;
}
@Override
public ChannelPromise addListener(GenericFutureListener<? extends Future<Void>> listener)
{
throw new UnsupportedOperationException( "Not supported yet." );
}
@Override
public ChannelPromise addListeners(GenericFutureListener<? extends Future<Void>>... listeners)
{
throw new UnsupportedOperationException( "Not supported yet." );
}
@Override
public ChannelPromise removeListener(GenericFutureListener<? extends Future<Void>> listener)
{
throw new UnsupportedOperationException( "Not supported yet." );
}
@Override
public ChannelPromise removeListeners(GenericFutureListener<? extends Future<Void>>... listeners)
{
throw new UnsupportedOperationException( "Not supported yet." );
}
@Override
public ChannelPromise sync() throws InterruptedException
{
throw new UnsupportedOperationException( "Not supported yet." );
}
@Override
public ChannelPromise syncUninterruptibly()
{
throw new UnsupportedOperationException( "Not supported yet." );
}
@Override
public ChannelPromise await() throws InterruptedException
{
throw new UnsupportedOperationException( "Not supported yet." );
}
@Override
public ChannelPromise awaitUninterruptibly()
{
throw new UnsupportedOperationException( "Not supported yet." );
}
@Override
public boolean isSuccess()
{
throw new UnsupportedOperationException( "Not supported yet." );
}
@Override
public Throwable cause()
{
throw new UnsupportedOperationException( "Not supported yet." );
}
@Override
public boolean await(long timeout, TimeUnit unit) throws InterruptedException
{
throw new UnsupportedOperationException( "Not supported yet." );
}
@Override
public boolean await(long timeoutMillis) throws InterruptedException
{
throw new UnsupportedOperationException( "Not supported yet." );
}
@Override
public boolean awaitUninterruptibly(long timeout, TimeUnit unit)
{
throw new UnsupportedOperationException( "Not supported yet." );
}
@Override
public boolean awaitUninterruptibly(long timeoutMillis)
{
throw new UnsupportedOperationException( "Not supported yet." );
}
@Override
public Void getNow()
{
throw new UnsupportedOperationException( "Not supported yet." );
}
@Override
public boolean cancel(boolean mayInterruptIfRunning)
{
throw new UnsupportedOperationException( "Not supported yet." );
}
@Override
public boolean isCancelled()
{
throw new UnsupportedOperationException( "Not supported yet." );
}
@Override
public boolean isDone()
{
return false;
}
@Override
public Void get() throws InterruptedException, ExecutionException
{
throw new UnsupportedOperationException( "Not supported yet." );
}
@Override
public Void get(long timeout, TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException
{
throw new UnsupportedOperationException( "Not supported yet." );
}
@Override
public boolean trySuccess(Void result)
{
throw new UnsupportedOperationException( "Not supported yet." );
}
@Override
public boolean tryFailure(Throwable cause)
{
throw new UnsupportedOperationException( "Not supported yet." );
}
}