commit 48ec4f75e6312fa20469668add00021eb205a4c7
author Yuta HIGUCHI <y-higuchi@onlab.us> Mon Oct 20 17:58:31 2014 -0700
committer Yuta HIGUCHI <y-higuchi@onlab.us> Mon Oct 20 18:05:27 2014 -0700
tree 90374d3dc4943828a9ce3e2023fe58d3430de73c
parent d0caacd3973ab7c2f12c0f295e021e0e0688792a

Revert "Using native transport (epoll) with netty"

This reverts commit f22f2043548ddba2c1a2ffc46ff0672006f1bc7e.

- It did not run inside karaf

Change-Id: Ieab6684bbde1029ad53337e9a4ee03623c2e6ab7

utils/netty/src/main/java/org/onlab/netty/NettyMessagingService.java

diff --git a/utils/netty/src/main/java/org/onlab/netty/NettyMessagingService.java b/utils/netty/src/main/java/org/onlab/netty/NettyMessagingService.java
index c3d3de9..7c875ef 100644
--- a/utils/netty/src/main/java/org/onlab/netty/NettyMessagingService.java
+++ b/utils/netty/src/main/java/org/onlab/netty/NettyMessagingService.java
@@ -16,11 +16,7 @@
 import io.netty.channel.ChannelInitializer;
 import io.netty.channel.ChannelOption;
 import io.netty.channel.EventLoopGroup;
-import io.netty.channel.ServerChannel;
 import io.netty.channel.SimpleChannelInboundHandler;
-import io.netty.channel.epoll.EpollEventLoopGroup;
-import io.netty.channel.epoll.EpollServerSocketChannel;
-import io.netty.channel.epoll.EpollSocketChannel;
 import io.netty.channel.nio.NioEventLoopGroup;
 import io.netty.channel.socket.SocketChannel;
 import io.netty.channel.socket.nio.NioServerSocketChannel;
@@ -44,10 +40,9 @@
 
     private final int port;
     private final Endpoint localEp;
-    private EventLoopGroup bossGroup;
+    private final EventLoopGroup bossGroup = new NioEventLoopGroup();
     private EventLoopGroup workerGroup;
-    private Class<? extends Channel> clientChannelClass;
-    private Class<? extends ServerChannel> serverChannelClass;
+    private Class<? extends Channel> channelClass;
     private final ConcurrentMap<String, MessageHandler> handlers = new ConcurrentHashMap<>();
     private final Cache<Long, AsyncResponse> responseFutures = CacheBuilder.newBuilder()
             .maximumSize(100000)
@@ -60,17 +55,8 @@
 
     // TODO: make this configurable.
     private void initEventLoopGroup() {
-        try {
-            bossGroup = new EpollEventLoopGroup();
-            workerGroup = new EpollEventLoopGroup();
-            clientChannelClass = EpollSocketChannel.class;
-            serverChannelClass = EpollServerSocketChannel.class;
-        } catch (Throwable th) {
-            bossGroup = new NioEventLoopGroup();
-            workerGroup = new NioEventLoopGroup();
-            serverChannelClass = NioServerSocketChannel.class;
-            clientChannelClass = NioSocketChannel.class;
-        }
+        workerGroup = new NioEventLoopGroup();
+        channelClass = NioSocketChannel.class;
     }
 
     public NettyMessagingService() {
@@ -164,7 +150,7 @@
         // TODO: Need JVM options to configure PooledByteBufAllocator.
         b.option(ChannelOption.ALLOCATOR, PooledByteBufAllocator.DEFAULT);
         b.group(bossGroup, workerGroup)
-            .channel(serverChannelClass)
+            .channel(NioServerSocketChannel.class)
             .childHandler(new OnosCommunicationChannelInitializer())
             .option(ChannelOption.SO_BACKLOG, 128)
             .childOption(ChannelOption.SO_KEEPALIVE, true);
@@ -195,7 +181,7 @@
             bootstrap.group(workerGroup);
             // TODO: Make this faster:
             // http://normanmaurer.me/presentations/2014-facebook-eng-netty/slides.html#37.0
-            bootstrap.channel(clientChannelClass);
+            bootstrap.channel(channelClass);
             bootstrap.option(ChannelOption.SO_KEEPALIVE, true);
             bootstrap.handler(new OnosCommunicationChannelInitializer());
             // Start the client.