From a9de162bcab7a0f7e7ca5cf4aa5267edaf5b1fce Mon Sep 17 00:00:00 2001 From: Sergii Tkachenko Date: Mon, 28 Sep 2020 13:12:34 -0400 Subject: [PATCH] netty: use composite cumulator for perf flamegraph tests --- alts/src/main/java/io/grpc/alts/internal/TsiFrameHandler.java | 1 + .../main/java/io/grpc/alts/internal/TsiHandshakeHandler.java | 3 ++- .../main/java/io/grpc/netty/GrpcHttp2ConnectionHandler.java | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/alts/src/main/java/io/grpc/alts/internal/TsiFrameHandler.java b/alts/src/main/java/io/grpc/alts/internal/TsiFrameHandler.java index 2294d7a07e6..d00f97ad3cd 100644 --- a/alts/src/main/java/io/grpc/alts/internal/TsiFrameHandler.java +++ b/alts/src/main/java/io/grpc/alts/internal/TsiFrameHandler.java @@ -48,6 +48,7 @@ public final class TsiFrameHandler extends ByteToMessageDecoder implements Chann public TsiFrameHandler(TsiFrameProtector protector) { this.protector = checkNotNull(protector, "protector"); + setCumulator(COMPOSITE_CUMULATOR); } @Override diff --git a/alts/src/main/java/io/grpc/alts/internal/TsiHandshakeHandler.java b/alts/src/main/java/io/grpc/alts/internal/TsiHandshakeHandler.java index a4123a7a53e..675c0a9c693 100644 --- a/alts/src/main/java/io/grpc/alts/internal/TsiHandshakeHandler.java +++ b/alts/src/main/java/io/grpc/alts/internal/TsiHandshakeHandler.java @@ -93,6 +93,7 @@ public TsiHandshakeHandler( this.handshaker = checkNotNull(handshaker, "handshaker"); this.handshakeValidator = checkNotNull(handshakeValidator, "handshakeValidator"); this.next = checkNotNull(next, "next"); + setCumulator(COMPOSITE_CUMULATOR); } @Override @@ -190,4 +191,4 @@ private void sendHandshake(ChannelHandlerContext ctx) throws GeneralSecurityExce protected void handlerRemoved0(ChannelHandlerContext ctx) throws Exception { handshaker.close(); } -} \ No newline at end of file +} diff --git a/netty/src/main/java/io/grpc/netty/GrpcHttp2ConnectionHandler.java b/netty/src/main/java/io/grpc/netty/GrpcHttp2ConnectionHandler.java index 65cac8d1eaf..9643bd8e74e 100644 --- a/netty/src/main/java/io/grpc/netty/GrpcHttp2ConnectionHandler.java +++ b/netty/src/main/java/io/grpc/netty/GrpcHttp2ConnectionHandler.java @@ -42,6 +42,7 @@ protected GrpcHttp2ConnectionHandler( Http2Settings initialSettings) { super(decoder, encoder, initialSettings); this.channelUnused = channelUnused; + setCumulator(COMPOSITE_CUMULATOR); } /**