Merge pull request #108 from sbuzzard/perf_changes_flush

Performance improvement, moving write and flush out of enframed and i…
Verizon · May 31, 2016 · 5cccaaf · 5cccaaf · ahjohannessen · May 31, 2016
2 parents 813733b + cfd262b
commit 5cccaaf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/core/src/main/scala/transport/netty/Client.scala b/core/src/main/scala/transport/netty/Client.scala
@@ -70,7 +70,7 @@ object NettyTransport {
                    })
   }
 
-  def write(c: Channel)(frame: Framed): Task[Unit] = evalCF(c.write(frame))
+  def write(c: Channel)(frame: Framed): Task[Unit] = evalCF(c.writeAndFlush(frame))
 
   def single(host: InetSocketAddress,
              expectedSigs: Set[Signature] = Set.empty,

diff --git a/core/src/main/scala/transport/netty/Transport.scala b/core/src/main/scala/transport/netty/Transport.scala
@@ -126,7 +126,7 @@ class Deframe extends ByteToMessageDecoder {
           } else {
             remaining = Some(rem)
           }
-        } 
+        }
       case Some(rem) =>
         // we are waiting for at least rem more bytes, as that is what
         // is outstanding in the current frame
@@ -177,9 +177,9 @@ object Enframe extends ChannelOutboundHandlerAdapter {
     obj match {
       case Bits(bv) =>
         val byv = bv.toByteVector
-        val _ = ctx.writeAndFlush(Unpooled.wrappedBuffer((codecs.int32.encode(byv.size).require ++ bv).toByteBuffer), cp)
+        val _ = ctx.write(Unpooled.wrappedBuffer((codecs.int32.encode(byv.size).require ++ bv).toByteBuffer), cp)
       case EOS =>
-        val _ = ctx.writeAndFlush(Unpooled.wrappedBuffer(codecs.int32.encode(0).require.toByteBuffer), cp)
+        val _ = ctx.write(Unpooled.wrappedBuffer(codecs.int32.encode(0).require.toByteBuffer), cp)
       case x => throw new IllegalArgumentException("was expecting Framed, got: " + x)
     }
   }