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

utils: remove unused now parameter from RTTStats.UpdateRTT (#4780)

Browse Source
This commit is contained in:
Marten Seemann
2024-12-22 14:50:31 +08:00
committed by GitHub
parent a584e58099
commit 5dbb46dcc1
10 changed files with 57 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
internal/ackhandler/sent_packet_handler.go
View File

@@ -338,7 +338,7 @@ func (h *sentPacketHandler) ReceivedAck(ack *wire.AckFrame, encLevel protocol.En
if encLevel == protocol.Encryption1RTT {
ackDelay = min(ack.DelayTime, h.rttStats.MaxAckDelay())
}
h.rttStats.UpdateRTT(rcvTime.Sub(p.SendTime), ackDelay, rcvTime)
h.rttStats.UpdateRTT(rcvTime.Sub(p.SendTime), ackDelay)
if h.logger.Debug() {
h.logger.Debugf("\tupdated RTT: %s (σ: %s)", h.rttStats.SmoothedRTT(), h.rttStats.MeanDeviation())
}
@@ -890,7 +890,7 @@ func (h *sentPacketHandler) ResetForRetry(now time.Time) error {
// Otherwise, we don't know which Initial the Retry was sent in response to.
if h.ptoCount == 0 {
// Don't set the RTT to a value lower than 5ms here.
h.rttStats.UpdateRTT(max(minRTTAfterRetry, now.Sub(firstPacketSendTime)), 0, now)
h.rttStats.UpdateRTT(max(minRTTAfterRetry, now.Sub(firstPacketSendTime)), 0)
if h.logger.Debug() {
h.logger.Debugf("\tupdated RTT: %s (σ: %s)", h.rttStats.SmoothedRTT(), h.rttStats.MeanDeviation())
}

12
internal/ackhandler/sent_packet_handler_test.go
View File

@@ -125,7 +125,7 @@ var _ = Describe("SentPacketHandler", func() {
}
updateRTT := func(rtt time.Duration) {
handler.rttStats.UpdateRTT(rtt, 0, time.Now())
handler.rttStats.UpdateRTT(rtt, 0)
ExpectWithOffset(1, handler.rttStats.SmoothedRTT()).To(Equal(rtt))
}
@@ -416,7 +416,7 @@ var _ = Describe("SentPacketHandler", func() {
sentPacket(initialPacket(&packet{PacketNumber: 1}))
handler.rttStats.SetMaxAckDelay(time.Hour)
// make sure the rttStats have a min RTT, so that the delay is used
handler.rttStats.UpdateRTT(5*time.Minute, 0, time.Now())
handler.rttStats.UpdateRTT(5*time.Minute, 0)
getPacket(1, protocol.EncryptionInitial).SendTime = time.Now().Add(-10 * time.Minute)
ack := &wire.AckFrame{
AckRanges: []wire.AckRange{{Smallest: 1, Largest: 1}},
@@ -430,7 +430,7 @@ var _ = Describe("SentPacketHandler", func() {
It("uses the DelayTime in the ACK frame", func() {
handler.rttStats.SetMaxAckDelay(time.Hour)
// make sure the rttStats have a min RTT, so that the delay is used
handler.rttStats.UpdateRTT(5*time.Minute, 0, time.Now())
handler.rttStats.UpdateRTT(5*time.Minute, 0)
getPacket(1, protocol.Encryption1RTT).SendTime = time.Now().Add(-10 * time.Minute)
ack := &wire.AckFrame{
AckRanges: []wire.AckRange{{Smallest: 1, Largest: 1}},
@@ -444,7 +444,7 @@ var _ = Describe("SentPacketHandler", func() {
It("limits the DelayTime in the ACK frame to max_ack_delay", func() {
handler.rttStats.SetMaxAckDelay(time.Minute)
// make sure the rttStats have a min RTT, so that the delay is used
handler.rttStats.UpdateRTT(5*time.Minute, 0, time.Now())
handler.rttStats.UpdateRTT(5*time.Minute, 0)
getPacket(1, protocol.Encryption1RTT).SendTime = time.Now().Add(-10 * time.Minute)
ack := &wire.AckFrame{
AckRanges: []wire.AckRange{{Smallest: 1, Largest: 1}},
@@ -752,7 +752,7 @@ var _ = Describe("SentPacketHandler", func() {
handler.ReceivedPacket(protocol.EncryptionHandshake)
now := time.Now()
handler.rttStats.UpdateRTT(time.Second/2, 0, now)
handler.rttStats.UpdateRTT(time.Second/2, 0)
Expect(handler.rttStats.SmoothedRTT()).To(Equal(time.Second / 2))
Expect(handler.rttStats.PTO(true)).To(And(
BeNumerically(">", time.Second),
@@ -1442,7 +1442,7 @@ var _ = Describe("SentPacketHandler", func() {
ecnHandler = NewMockECNHandler(mockCtrl)
lostPackets = nil
var rttStats utils.RTTStats
rttStats.UpdateRTT(time.Hour, 0, time.Now())
rttStats.UpdateRTT(time.Hour, 0)
handler = newSentPacketHandler(42, protocol.InitialPacketSize, &rttStats, false, false, perspective, nil, utils.DefaultLogger)
handler.ecnTracker = ecnHandler
handler.congestion = cong