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

ackhandler: fix qlogging of alarm timer expiration time (#5363)

Browse Source
This commit is contained in:
Marten Seemann
2025-10-09 16:21:06 +08:00
committed by GitHub
parent e0f9663be4
commit 03a99447fd
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
internal/ackhandler/sent_packet_handler.go
View File

@@ -697,6 +697,7 @@ func (h *sentPacketHandler) setLossDetectionTimer(now monotime.Time) {
Type: qlog.LossTimerUpdateTypeSet, Type: qlog.LossTimerUpdateTypeSet,
TimerType: newAlarm.TimerType, TimerType: newAlarm.TimerType,
EncLevel: newAlarm.EncryptionLevel, EncLevel: newAlarm.EncryptionLevel,
Time: newAlarm.Time.ToTime(),
}) })
} }
} }

20
internal/ackhandler/sent_packet_handler_test.go
View File

@@ -565,7 +565,7 @@ func testSentPacketHandlerPTO(t *testing.T, encLevel protocol.EncryptionLevel, p
sph.DropPackets(protocol.EncryptionHandshake, monotime.Now()) sph.DropPackets(protocol.EncryptionHandshake, monotime.Now())
} }
sendPacket := func(t *testing.T, ti monotime.Time, ackEliciting bool) protocol.PacketNumber { sendPacket := func(t *testing.T, ti monotime.Time, ackEliciting bool, ptoCount uint) protocol.PacketNumber {
t.Helper() t.Helper()
pn := sph.PopPacketNumber(encLevel) pn := sph.PopPacketNumber(encLevel)
@@ -577,6 +577,7 @@ func testSentPacketHandlerPTO(t *testing.T, encLevel protocol.EncryptionLevel, p
Type: qlog.LossTimerUpdateTypeSet, Type: qlog.LossTimerUpdateTypeSet,
TimerType: qlog.TimerTypePTO, TimerType: qlog.TimerTypePTO,
EncLevel: encLevel, EncLevel: encLevel,
Time: ti.ToTime().Add(rttStats.PTO(encLevel == protocol.Encryption1RTT) << ptoCount),
}, },
}, },
eventRecorder.Events(qlog.LossTimerUpdated{}), eventRecorder.Events(qlog.LossTimerUpdated{}),
@@ -599,9 +600,9 @@ func testSentPacketHandlerPTO(t *testing.T, encLevel protocol.EncryptionLevel, p
var pns []protocol.PacketNumber var pns []protocol.PacketNumber
// send packet 0, 1, 2, 3 // send packet 0, 1, 2, 3
for i := range 3 { for i := range 3 {
pns = append(pns, sendPacket(t, sendTimes[i], true)) pns = append(pns, sendPacket(t, sendTimes[i], true, 0))
} }
pns = append(pns, sendPacket(t, sendTimes[3], false)) pns = append(pns, sendPacket(t, sendTimes[3], false, 0))
// The PTO includes the max_ack_delay only for the application-data packet number space. // The PTO includes the max_ack_delay only for the application-data packet number space.
// Make sure that the value is actually different, so this test is meaningful. // Make sure that the value is actually different, so this test is meaningful.
@@ -627,6 +628,7 @@ func testSentPacketHandlerPTO(t *testing.T, encLevel protocol.EncryptionLevel, p
Type: qlog.LossTimerUpdateTypeSet, Type: qlog.LossTimerUpdateTypeSet,
TimerType: qlog.TimerTypePTO, TimerType: qlog.TimerTypePTO,
EncLevel: encLevel, EncLevel: encLevel,
Time: sendTimes[2].Add(2 * rttStats.PTO(encLevel == protocol.Encryption1RTT)).ToTime(),
}, },
}, },
eventRecorder.Events(qlog.MetricsUpdated{}, qlog.LossTimerUpdated{}), eventRecorder.Events(qlog.MetricsUpdated{}, qlog.LossTimerUpdated{}),
@@ -655,11 +657,11 @@ func testSentPacketHandlerPTO(t *testing.T, encLevel protocol.EncryptionLevel, p
sendTimes = append(sendTimes, now.Add(200*time.Millisecond)) sendTimes = append(sendTimes, now.Add(200*time.Millisecond))
sendTimes = append(sendTimes, now.Add(300*time.Millisecond)) sendTimes = append(sendTimes, now.Add(300*time.Millisecond))
require.Equal(t, ptoMode, sph.SendMode(sendTimes[4])) // first probe packet require.Equal(t, ptoMode, sph.SendMode(sendTimes[4])) // first probe packet
pns = append(pns, sendPacket(t, sendTimes[4], true)) pns = append(pns, sendPacket(t, sendTimes[4], true, 1))
require.Equal(t, ptoMode, sph.SendMode(sendTimes[5])) // next probe packet require.Equal(t, ptoMode, sph.SendMode(sendTimes[5])) // next probe packet
pns = append(pns, sendPacket(t, sendTimes[5], false)) pns = append(pns, sendPacket(t, sendTimes[5], false, 1))
require.Equal(t, ptoMode, sph.SendMode(sendTimes[6])) // non-ack-eliciting packet didn't count as a probe packet require.Equal(t, ptoMode, sph.SendMode(sendTimes[6])) // non-ack-eliciting packet didn't count as a probe packet
pns = append(pns, sendPacket(t, sendTimes[6], true)) pns = append(pns, sendPacket(t, sendTimes[6], true, 1))
require.Equal(t, SendAny, sph.SendMode(sendTimes[6])) // enough probe packets sent require.Equal(t, SendAny, sph.SendMode(sendTimes[6])) // enough probe packets sent
timeout = sph.GetLossDetectionTimeout() timeout = sph.GetLossDetectionTimeout()
@@ -682,6 +684,7 @@ func testSentPacketHandlerPTO(t *testing.T, encLevel protocol.EncryptionLevel, p
Type: qlog.LossTimerUpdateTypeSet, Type: qlog.LossTimerUpdateTypeSet,
TimerType: qlog.TimerTypePTO, TimerType: qlog.TimerTypePTO,
EncLevel: encLevel, EncLevel: encLevel,
Time: sendTimes[6].Add(4 * rttStats.PTO(encLevel == protocol.Encryption1RTT)).ToTime(),
}, },
}, },
eventRecorder.Events(qlog.LossTimerUpdated{}, qlog.MetricsUpdated{}), eventRecorder.Events(qlog.LossTimerUpdated{}, qlog.MetricsUpdated{}),
@@ -694,9 +697,9 @@ func testSentPacketHandlerPTO(t *testing.T, encLevel protocol.EncryptionLevel, p
sendTimes = append(sendTimes, now.Add(100*time.Millisecond)) sendTimes = append(sendTimes, now.Add(100*time.Millisecond))
sendTimes = append(sendTimes, now.Add(200*time.Millisecond)) sendTimes = append(sendTimes, now.Add(200*time.Millisecond))
require.Equal(t, ptoMode, sph.SendMode(sendTimes[7])) // first probe packet require.Equal(t, ptoMode, sph.SendMode(sendTimes[7])) // first probe packet
pns = append(pns, sendPacket(t, sendTimes[7], true)) pns = append(pns, sendPacket(t, sendTimes[7], true, 2))
require.Equal(t, ptoMode, sph.SendMode(sendTimes[8])) // next probe packet require.Equal(t, ptoMode, sph.SendMode(sendTimes[8])) // next probe packet
pns = append(pns, sendPacket(t, sendTimes[8], true)) pns = append(pns, sendPacket(t, sendTimes[8], true, 2))
require.Equal(t, SendAny, sph.SendMode(sendTimes[8])) // enough probe packets sent require.Equal(t, SendAny, sph.SendMode(sendTimes[8])) // enough probe packets sent
timeout = sph.GetLossDetectionTimeout() timeout = sph.GetLossDetectionTimeout()
@@ -729,6 +732,7 @@ func testSentPacketHandlerPTO(t *testing.T, encLevel protocol.EncryptionLevel, p
Type: qlog.LossTimerUpdateTypeSet, Type: qlog.LossTimerUpdateTypeSet,
TimerType: qlog.TimerTypePTO, TimerType: qlog.TimerTypePTO,
EncLevel: encLevel, EncLevel: encLevel,
Time: sendTimes[8].Add(rttStats.PTO(encLevel == protocol.Encryption1RTT)).ToTime(),
}, },
}, },
eventRecorder.Events(qlog.LossTimerUpdated{}), eventRecorder.Events(qlog.LossTimerUpdated{}),