gr1ffon/quic-go
1
0
Fork 0
forked from quic-go/quic-go
Code Pull Requests Activity

remove MaybeTriggerBlocked from flowController

Browse Source
This commit is contained in:
Lucas Clemente
2016-07-09 18:09:37 +02:00
parent a09de18f56
commit 8dc330f818
2 changed files with 2 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
flowcontrol/flow_controller.go
View File

@@ -14,7 +14,6 @@ type flowController struct {
bytesSent protocol.ByteCount
sendFlowControlWindow protocol.ByteCount
lastBlockedSentForOffset protocol.ByteCount
bytesRead protocol.ByteCount
highestReceived protocol.ByteCount
@@ -122,28 +121,6 @@ func (c *flowController) AddBytesRead(n protocol.ByteCount) {
c.bytesRead += n
}
// MaybeTriggerBlocked determines if it is necessary to send a Blocked for this stream
// it makes sure that only one Blocked is sent for each offset
func (c *flowController) MaybeTriggerBlocked() bool {
if c.SendWindowSize() != 0 {
return false
}
c.mutex.RLock()
sendFlowControlWindow := c.getSendFlowControlWindow()
c.mutex.RUnlock()
c.mutex.Lock()
defer c.mutex.Unlock()
if c.lastBlockedSentForOffset == sendFlowControlWindow {
return false
}
c.lastBlockedSentForOffset = sendFlowControlWindow
return true
}
// MaybeTriggerWindowUpdate determines if it is necessary to send a WindowUpdate
// if so, it returns true and the offset of the window
func (c *flowController) MaybeTriggerWindowUpdate() (bool, protocol.ByteCount) {

28
flowcontrol/flow_controller_test.go
View File

@@ -131,34 +131,6 @@ var _ = Describe("Flow controller", func() {
setConnectionParametersManagerWindow(cpm, "sendConnectionFlowControlWindow", 9000)
Expect(controller.getSendFlowControlWindow()).To(Equal(protocol.ByteCount(7000)))
})
Context("Blocked", func() {
var sendFlowControlWindow protocol.ByteCount = 20
BeforeEach(func() {
controller.sendFlowControlWindow = sendFlowControlWindow
})
It("sends a Blocked when there's no space left in the window", func() {
controller.bytesSent = sendFlowControlWindow
Expect(controller.MaybeTriggerBlocked()).To(BeTrue())
})
It("does not send a Blocked when there's still space in the window", func() {
controller.bytesSent = sendFlowControlWindow - 1
Expect(controller.MaybeTriggerBlocked()).To(BeFalse())
})
It("only sends one Blocked for one offset", func() {
controller.bytesSent = sendFlowControlWindow
Expect(controller.MaybeTriggerBlocked()).To(BeTrue())
Expect(controller.MaybeTriggerBlocked()).To(BeFalse())
updateSuccessfull := controller.UpdateSendWindow(sendFlowControlWindow + 1)
Expect(updateSuccessfull).To(BeTrue())
controller.bytesSent = sendFlowControlWindow + 1
Expect(controller.MaybeTriggerBlocked()).To(BeTrue())
})
})
})
Context("receive flow control", func() {