optimize updating the RTT when receiving an ACK

This commit is contained in:
Marten Seemann
2018-03-11 12:13:29 +07:00
parent 9ffeba5445
commit 6a80d50fb9
3 changed files with 22 additions and 14 deletions

View File

@@ -239,20 +239,11 @@ func (h *sentPacketHandler) determineNewlyAckedPackets(ackFrame *wire.AckFrame)
}
func (h *sentPacketHandler) maybeUpdateRTT(largestAcked protocol.PacketNumber, ackDelay time.Duration, rcvTime time.Time) bool {
var rttUpdated bool
h.packetHistory.Iterate(func(p *Packet) (bool, error) {
if p.PacketNumber == largestAcked {
h.rttStats.UpdateRTT(rcvTime.Sub(p.sendTime), ackDelay, rcvTime)
rttUpdated = true
return false, nil
}
// Packets are sorted by number, so we can stop searching
if p.PacketNumber > largestAcked {
return false, nil
}
return true, nil
})
return rttUpdated
if p := h.packetHistory.GetPacket(largestAcked); p != nil {
h.rttStats.UpdateRTT(rcvTime.Sub(p.sendTime), ackDelay, rcvTime)
return true
}
return false
}
func (h *sentPacketHandler) updateLossDetectionAlarm(now time.Time) {

View File

@@ -23,6 +23,13 @@ func (h *sentPacketHistory) SentPacket(p *Packet) {
h.packetMap[p.PacketNumber] = el
}
func (h *sentPacketHistory) GetPacket(p protocol.PacketNumber) *Packet {
if el, ok := h.packetMap[p]; ok {
return &el.Value
}
return nil
}
// Iterate iterates through all packets.
// The callback must not modify the history.
func (h *sentPacketHistory) Iterate(cb func(*Packet) (cont bool, err error)) error {

View File

@@ -53,6 +53,16 @@ var _ = Describe("SentPacketHistory", func() {
Expect(front.PacketNumber).To(Equal(protocol.PacketNumber(2)))
})
It("gets a packet by packet number", func() {
p := &Packet{PacketNumber: 2}
hist.SentPacket(p)
Expect(hist.GetPacket(2)).To(Equal(p))
})
It("returns nil if the packet doesn't exist", func() {
Expect(hist.GetPacket(1337)).To(BeNil())
})
It("removes packets", func() {
hist.SentPacket(&Packet{PacketNumber: 1})
hist.SentPacket(&Packet{PacketNumber: 4})