mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2025-11-07 11:42:03 +01:00
Code Issues Projects Releases Wiki Activity

Netty performance improvements

Browse Source
This commit is contained in:
Madan Jampani 2014-10-04 23:48:44 -07:00
parent 885be1d0ae
commit ddf76223f2
2 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
utils/netty/src/main/java/org/onlab/netty/MessageEncoder.java
View File

@ -1,12 +1,14 @@
package org.onlab.netty; package org.onlab.netty;
import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandler.Sharable;
import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.MessageToByteEncoder; import io.netty.handler.codec.MessageToByteEncoder;
/** /**
* Encode InternalMessage out into a byte buffer. * Encode InternalMessage out into a byte buffer.
*/ */
@Sharable
public class MessageEncoder extends MessageToByteEncoder<InternalMessage> { public class MessageEncoder extends MessageToByteEncoder<InternalMessage> {
// onosiscool in ascii // onosiscool in ascii

54
utils/netty/src/main/java/org/onlab/netty/NettyMessagingService.java
View File

@ -11,6 +11,7 @@ import io.netty.bootstrap.ServerBootstrap;
import io.netty.buffer.PooledByteBufAllocator; import io.netty.buffer.PooledByteBufAllocator;
import io.netty.channel.Channel; import io.netty.channel.Channel;
import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelFuture;
import io.netty.channel.ChannelHandler;
import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelInitializer; import io.netty.channel.ChannelInitializer;
import io.netty.channel.ChannelOption; import io.netty.channel.ChannelOption;
@ -37,14 +38,19 @@ public class NettyMessagingService implements MessagingService {
private final Logger log = LoggerFactory.getLogger(getClass()); private final Logger log = LoggerFactory.getLogger(getClass());
private GenericKeyedObjectPool<Endpoint, Channel> channels;
private final int port; private final int port;
private final Endpoint localEp;
private final EventLoopGroup bossGroup = new NioEventLoopGroup(); private final EventLoopGroup bossGroup = new NioEventLoopGroup();
private final EventLoopGroup workerGroup = new NioEventLoopGroup(); private final EventLoopGroup workerGroup = new NioEventLoopGroup();
private final ConcurrentMap<String, MessageHandler> handlers = new ConcurrentHashMap<>(); private final ConcurrentMap<String, MessageHandler> handlers = new ConcurrentHashMap<>();
private Cache<Long, AsyncResponse<?>> responseFutures; private final Cache<Long, AsyncResponse<?>> responseFutures = CacheBuilder.newBuilder()
private final Endpoint localEp; .maximumSize(100000)
.weakValues()
// TODO: Once the entry expires, notify blocking threads (if any).
.expireAfterWrite(10, TimeUnit.MINUTES)
.build();
private final GenericKeyedObjectPool<Endpoint, Channel> channels
= new GenericKeyedObjectPool<Endpoint, Channel>(new OnosCommunicationChannelFactory());
protected Serializer serializer; protected Serializer serializer;
@ -65,15 +71,8 @@ public class NettyMessagingService implements MessagingService {
} }
public void activate() throws Exception { public void activate() throws Exception {
channels = new GenericKeyedObjectPool<Endpoint, Channel>(new OnosCommunicationChannelFactory());
channels.setTestOnBorrow(true); channels.setTestOnBorrow(true);
channels.setTestOnReturn(true); channels.setTestOnReturn(true);
responseFutures = CacheBuilder.newBuilder()
.maximumSize(100000)
.weakValues()
// TODO: Once the entry expires, notify blocking threads (if any).
.expireAfterWrite(10, TimeUnit.MINUTES)
.build();
startAcceptingConnections(); startAcceptingConnections();
} }
@ -145,7 +144,8 @@ public class NettyMessagingService implements MessagingService {
private void startAcceptingConnections() throws InterruptedException { private void startAcceptingConnections() throws InterruptedException {
ServerBootstrap b = new ServerBootstrap(); ServerBootstrap b = new ServerBootstrap();
b.option(ChannelOption.WRITE_BUFFER_HIGH_WATER_MARK, 32 * 1024); b.option(ChannelOption.WRITE_BUFFER_HIGH_WATER_MARK, 32 * 1024);
b.option(ChannelOption.WRITE_BUFFER_LOW_WATER_MARK, 32 * 1024); b.option(ChannelOption.WRITE_BUFFER_LOW_WATER_MARK, 8 * 1024);
// TODO: Need JVM options to configure PooledByteBufAllocator.
b.option(ChannelOption.ALLOCATOR, PooledByteBufAllocator.DEFAULT); b.option(ChannelOption.ALLOCATOR, PooledByteBufAllocator.DEFAULT);
b.group(bossGroup, workerGroup) b.group(bossGroup, workerGroup)
.channel(NioServerSocketChannel.class) .channel(NioServerSocketChannel.class)
@ -172,19 +172,18 @@ public class NettyMessagingService implements MessagingService {
@Override @Override
public Channel makeObject(Endpoint ep) throws Exception { public Channel makeObject(Endpoint ep) throws Exception {
Bootstrap b = new Bootstrap(); Bootstrap bootstrap = new Bootstrap();
b.option(ChannelOption.ALLOCATOR, PooledByteBufAllocator.DEFAULT); bootstrap.option(ChannelOption.ALLOCATOR, PooledByteBufAllocator.DEFAULT);
b.option(ChannelOption.WRITE_BUFFER_HIGH_WATER_MARK, 32 * 1024); bootstrap.option(ChannelOption.WRITE_BUFFER_HIGH_WATER_MARK, 32 * 1024);
b.option(ChannelOption.WRITE_BUFFER_LOW_WATER_MARK, 32 * 1024); bootstrap.option(ChannelOption.WRITE_BUFFER_LOW_WATER_MARK, 8 * 1024);
b.group(workerGroup); bootstrap.group(workerGroup);
// TODO: Make this faster: // TODO: Make this faster:
// http://normanmaurer.me/presentations/2014-facebook-eng-netty/slides.html#37.0 // http://normanmaurer.me/presentations/2014-facebook-eng-netty/slides.html#37.0
b.channel(NioSocketChannel.class); bootstrap.channel(NioSocketChannel.class);
b.option(ChannelOption.SO_KEEPALIVE, true); bootstrap.option(ChannelOption.SO_KEEPALIVE, true);
b.handler(new OnosCommunicationChannelInitializer()); bootstrap.handler(new OnosCommunicationChannelInitializer());
// Start the client. // Start the client.
ChannelFuture f = b.connect(ep.host(), ep.port()).sync(); ChannelFuture f = bootstrap.connect(ep.host(), ep.port()).sync();
return f.channel(); return f.channel();
} }
@ -201,12 +200,15 @@ public class NettyMessagingService implements MessagingService {
private class OnosCommunicationChannelInitializer extends ChannelInitializer<SocketChannel> { private class OnosCommunicationChannelInitializer extends ChannelInitializer<SocketChannel> {
private final ChannelHandler dispatcher = new InboundMessageDispatcher();
private final ChannelHandler encoder = new MessageEncoder(serializer);
@Override @Override
protected void initChannel(SocketChannel channel) throws Exception { protected void initChannel(SocketChannel channel) throws Exception {
channel.pipeline() channel.pipeline()
.addLast("encoder", new MessageEncoder(serializer)) .addLast("encoder", encoder)
.addLast("decoder", new MessageDecoder(NettyMessagingService.this, serializer)) .addLast("decoder", new MessageDecoder(NettyMessagingService.this, serializer))
.addLast("handler", new InboundMessageDispatcher()); .addLast("handler", dispatcher);
} }
} }
@ -222,10 +224,11 @@ public class NettyMessagingService implements MessagingService {
@Override @Override
public void run() { public void run() {
channel.writeAndFlush(message); channel.writeAndFlush(message, channel.voidPromise());
} }
} }
@ChannelHandler.Sharable
private class InboundMessageDispatcher extends SimpleChannelInboundHandler<InternalMessage> { private class InboundMessageDispatcher extends SimpleChannelInboundHandler<InternalMessage> {
@Override @Override
@ -248,7 +251,6 @@ public class NettyMessagingService implements MessagingService {
handler.handle(message); handler.handle(message);
} }
@Override @Override
public void exceptionCaught(ChannelHandlerContext context, Throwable cause) { public void exceptionCaught(ChannelHandlerContext context, Throwable cause) {
context.close(); context.close();