mirrors/uquic
1
0
Fork 0
mirror of https://github.com/refraction-networking/uquic.git synced 2025-04-04 20:57:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

add a flag to turn off PRR

Browse source
This commit is contained in:
Marten Seemann 2019-05-21 10:57:55 +01:00
parent 8afed81c49
commit fd33eb319f
2 changed files with 24 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
internal/congestion/cubic_sender.go
View file

@ -20,7 +20,8 @@ type cubicSender struct {
stats connectionStats stats connectionStats
cubic *Cubic cubic *Cubic
reno bool noPRR bool
reno bool
// Track the largest packet that has been sent. // Track the largest packet that has been sent.
largestSentPacketNumber protocol.PacketNumber largestSentPacketNumber protocol.PacketNumber
@ -86,7 +87,7 @@ func NewCubicSender(clock Clock, rttStats *RTTStats, reno bool, initialCongestio
// TimeUntilSend returns when the next packet should be sent. // TimeUntilSend returns when the next packet should be sent.
func (c *cubicSender) TimeUntilSend(bytesInFlight protocol.ByteCount) time.Duration { func (c *cubicSender) TimeUntilSend(bytesInFlight protocol.ByteCount) time.Duration {
if c.InRecovery() { if !c.noPRR && c.InRecovery() {
// PRR is used when in recovery. // PRR is used when in recovery.
if c.prr.CanSend(c.GetCongestionWindow(), bytesInFlight, c.GetSlowStartThreshold()) { if c.prr.CanSend(c.GetCongestionWindow(), bytesInFlight, c.GetSlowStartThreshold()) {
return 0 return 0
@ -114,7 +115,7 @@ func (c *cubicSender) OnPacketSent(
} }
func (c *cubicSender) CanSend(bytesInFlight protocol.ByteCount) bool { func (c *cubicSender) CanSend(bytesInFlight protocol.ByteCount) bool {
if c.InRecovery() { if !c.noPRR && c.InRecovery() {
return c.prr.CanSend(c.GetCongestionWindow(), bytesInFlight, c.GetSlowStartThreshold()) return c.prr.CanSend(c.GetCongestionWindow(), bytesInFlight, c.GetSlowStartThreshold())
} }
return bytesInFlight < c.GetCongestionWindow() return bytesInFlight < c.GetCongestionWindow()
@ -159,7 +160,9 @@ func (c *cubicSender) OnPacketAcked(
c.largestAckedPacketNumber = utils.MaxPacketNumber(ackedPacketNumber, c.largestAckedPacketNumber) c.largestAckedPacketNumber = utils.MaxPacketNumber(ackedPacketNumber, c.largestAckedPacketNumber)
if c.InRecovery() { if c.InRecovery() {
// PRR is used when in recovery. // PRR is used when in recovery.
c.prr.OnPacketAcked(ackedBytes) if !c.noPRR {
c.prr.OnPacketAcked(ackedBytes)
}
return return
} }
c.maybeIncreaseCwnd(ackedPacketNumber, ackedBytes, priorInFlight, eventTime) c.maybeIncreaseCwnd(ackedPacketNumber, ackedBytes, priorInFlight, eventTime)
@ -192,7 +195,9 @@ func (c *cubicSender) OnPacketLost(
c.stats.slowstartPacketsLost++ c.stats.slowstartPacketsLost++
} }
c.prr.OnPacketLost(priorInFlight) if !c.noPRR {
c.prr.OnPacketLost(priorInFlight)
}
// TODO(chromium): Separate out all of slow start into a separate class. // TODO(chromium): Separate out all of slow start into a separate class.
if c.slowStartLargeReduction && c.InSlowStart() { if c.slowStartLargeReduction && c.InSlowStart() {

14
internal/congestion/cubic_sender_test.go
View file

@ -553,6 +553,20 @@ var _ = Describe("Cubic Sender", func() {
Expect(sender.GetCongestionWindow()).To(Equal(expectedSendWindow)) Expect(sender.GetCongestionWindow()).To(Equal(expectedSendWindow))
}) })
It("no PRR", func() {
sender.SetNumEmulatedConnections(1)
sender.noPRR = true
SendAvailableSendWindow()
LoseNPackets(9)
AckNPackets(1)
Expect(sender.GetCongestionWindow()).To(Equal(protocol.ByteCount(renoBeta * float32(defaultWindowTCP))))
windowInPackets := renoBeta * float32(defaultWindowTCP) / float32(protocol.DefaultTCPMSS)
numSent := SendAvailableSendWindow()
Expect(numSent).To(BeEquivalentTo(windowInPackets))
})
It("reset after connection migration", func() { It("reset after connection migration", func() {
Expect(sender.GetCongestionWindow()).To(Equal(defaultWindowTCP)) Expect(sender.GetCongestionWindow()).To(Equal(defaultWindowTCP))
Expect(sender.SlowstartThreshold()).To(Equal(MaxCongestionWindow)) Expect(sender.SlowstartThreshold()).To(Equal(MaxCongestionWindow))