From 638f6ae5e508ae70a3c49ec8aef33195f2c4704a Mon Sep 17 00:00:00 2001 From: Lucas Clemente Date: Sat, 17 Sep 2016 13:33:01 +0200 Subject: [PATCH] remove unnecessary flow control manager call --- stream_framer.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/stream_framer.go b/stream_framer.go index f1e40892d..b702c285d 100644 --- a/stream_framer.go +++ b/stream_framer.go @@ -89,8 +89,9 @@ func (f *streamFramer) maybePopNormalFrames(maxBytes protocol.ByteCount) (res [] } maxLen := maxBytes - currentLen - frameHeaderBytes + var sendWindowSize protocol.ByteCount if s.lenOfDataForWriting() != 0 { - sendWindowSize, _ := f.flowControlManager.SendWindowSize(s.streamID) + sendWindowSize, _ = f.flowControlManager.SendWindowSize(s.streamID) maxLen = utils.MinByteCount(maxLen, sendWindowSize) } @@ -118,7 +119,7 @@ func (f *streamFramer) maybePopNormalFrames(maxBytes protocol.ByteCount) (res [] if f.flowControlManager.RemainingConnectionWindowSize() == 0 { // We are now connection-level FC blocked f.blockedFrameQueue = append(f.blockedFrameQueue, &frames.BlockedFrame{StreamID: 0}) - } else if individualWindowSize, _ := f.flowControlManager.SendWindowSize(s.streamID); individualWindowSize == 0 { + } else if sendWindowSize-frame.DataLen() == 0 { // We are now stream-level FC blocked f.blockedFrameQueue = append(f.blockedFrameQueue, &frames.BlockedFrame{StreamID: s.StreamID()}) }