review commits

Angel-ML · Jun 25, 2017 · e5a444f · e5a444f
1 parent adc9ce2
commit e5a444f
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 230 deletions.
diff --git a/angel-ps/core/src/main/java/com/tencent/angel/ipc/NettyServer.java b/angel-ps/core/src/main/java/com/tencent/angel/ipc/NettyServer.java
@@ -94,7 +94,7 @@ public NettyServer(InetSocketAddress addr, Configuration conf) {
       protected void initChannel(SocketChannel ch) throws Exception {
         ch.pipeline()
             .addLast("encoder", NettyFrameEncoder.INSTANCE)
-            .addLast(TransportFrameDecoder.HANDLER_NAME, NettyUtils.createFrameDecoder())
+            .addLast("frameDecoder", NettyUtils.createFrameDecoder())
             .addLast("decoder", NettyFrameDecoder.INSTANCE)
             .addLast("handler", new NettyServerMLHandler());
       }

diff --git a/angel-ps/core/src/main/java/com/tencent/angel/ipc/NettyTransceiver.java b/angel-ps/core/src/main/java/com/tencent/angel/ipc/NettyTransceiver.java
@@ -110,7 +110,7 @@ public NettyTransceiver(
       protected void initChannel(SocketChannel ch) throws Exception {
         ch.pipeline()
             .addLast("encoder", NettyFrameEncoder.INSTANCE)
-            .addLast(TransportFrameDecoder.HANDLER_NAME, NettyUtils.createFrameDecoder())
+            .addLast("frameDecoder", NettyUtils.createFrameDecoder())
             .addLast("decoder", NettyFrameDecoder.INSTANCE)
             .addLast(
                 "readTimeout",

diff --git a/angel-ps/core/src/main/java/com/tencent/angel/ipc/NettyUtils.java b/angel-ps/core/src/main/java/com/tencent/angel/ipc/NettyUtils.java
@@ -30,6 +30,8 @@
 import io.netty.channel.nio.NioEventLoopGroup;
 import io.netty.channel.socket.nio.NioServerSocketChannel;
 import io.netty.channel.socket.nio.NioSocketChannel;
+import io.netty.handler.codec.ByteToMessageDecoder;
+import io.netty.handler.codec.LengthFieldBasedFrameDecoder;
 import io.netty.util.concurrent.DefaultThreadFactory;
 import io.netty.util.internal.PlatformDependent;
 
@@ -84,8 +86,13 @@ public static Class<? extends ServerChannel> getServerChannelClass(IOMode mode)
    * Creates a LengthFieldBasedFrameDecoder where the first 8 bytes are the length of the frame.
    * This is used before all decoders.
    */
-  public static TransportFrameDecoder createFrameDecoder() {
-    return new TransportFrameDecoder();
+  public static ByteToMessageDecoder createFrameDecoder() {
+    // maxFrameLength = 2G
+    // lengthFieldOffset = 0
+    // lengthFieldLength = 8
+    // lengthAdjustment = -8, i.e. exclude the 8 byte length itself
+    // initialBytesToStrip = 8, i.e. strip out the length field itself
+    return new LengthFieldBasedFrameDecoder(Integer.MAX_VALUE, 0, 8, -8, 8);
   }
 
   /** Returns the remote address on the channel or "&lt;unknown remote&gt;" if none exists. */

diff --git a/angel-ps/core/src/main/java/com/tencent/angel/ipc/TransportFrameDecoder.java b/angel-ps/core/src/main/java/com/tencent/angel/ipc/TransportFrameDecoder.java