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

simplify the maybeQueueAck method in the receivedPacketTracker

Browse Source
This commit is contained in:
Marten Seemann
2020-06-18 15:52:01 +07:00
parent 260356140f
commit 6b7f204676
2 changed files with 28 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
internal/ackhandler/received_packet_tracker.go
View File

@@ -61,7 +61,9 @@ func (h *receivedPacketTracker) ReceivedPacket(packetNumber protocol.PacketNumbe
if isNew := h.packetHistory.ReceivedPacket(packetNumber); isNew && shouldInstigateAck { if isNew := h.packetHistory.ReceivedPacket(packetNumber); isNew && shouldInstigateAck {
h.hasNewAck = true h.hasNewAck = true
} }
h.maybeQueueAck(packetNumber, rcvTime, shouldInstigateAck, isMissing) if shouldInstigateAck {
h.maybeQueueAck(packetNumber, rcvTime, isMissing)
}
} }
// IgnoreBelow sets a lower limit for acknowledging packets. // IgnoreBelow sets a lower limit for acknowledging packets.
@@ -94,8 +96,8 @@ func (h *receivedPacketTracker) hasNewMissingPackets() bool {
} }
// maybeQueueAck queues an ACK, if necessary. // maybeQueueAck queues an ACK, if necessary.
func (h *receivedPacketTracker) maybeQueueAck(packetNumber protocol.PacketNumber, rcvTime time.Time, shouldInstigateAck, wasMissing bool) { func (h *receivedPacketTracker) maybeQueueAck(pn protocol.PacketNumber, rcvTime time.Time, wasMissing bool) {
// always ack the first packet // always acknowledge the first packet
if h.lastAck == nil { if h.lastAck == nil {
if !h.ackQueued { if !h.ackQueued {
h.logger.Debugf("\tQueueing ACK because the first packet should be acknowledged.") h.logger.Debugf("\tQueueing ACK because the first packet should be acknowledged.")
@@ -104,36 +106,39 @@ func (h *receivedPacketTracker) maybeQueueAck(packetNumber protocol.PacketNumber
return return
} }
if h.ackQueued {
return
}
h.ackElicitingPacketsReceivedSinceLastAck++
// Send an ACK if this packet was reported missing in an ACK sent before. // Send an ACK if this packet was reported missing in an ACK sent before.
// Ack decimation with reordering relies on the timer to send an ACK, but if // Ack decimation with reordering relies on the timer to send an ACK, but if
// missing packets we reported in the previous ack, send an ACK immediately. // missing packets we reported in the previous ack, send an ACK immediately.
if wasMissing { if wasMissing {
if h.logger.Debug() { if h.logger.Debug() {
h.logger.Debugf("\tQueueing ACK because packet %d was missing before.", packetNumber) h.logger.Debugf("\tQueueing ACK because packet %d was missing before.", pn)
} }
h.ackQueued = true h.ackQueued = true
} }
if !h.ackQueued && shouldInstigateAck { // send an ACK every 2 ack-eliciting packets
h.ackElicitingPacketsReceivedSinceLastAck++ if h.ackElicitingPacketsReceivedSinceLastAck >= packetsBeforeAck {
if h.logger.Debug() {
// send an ACK every 2 ack-eliciting packets h.logger.Debugf("\tQueueing ACK because packet %d packets were received after the last ACK (using initial threshold: %d).", h.ackElicitingPacketsReceivedSinceLastAck, packetsBeforeAck)
if h.ackElicitingPacketsReceivedSinceLastAck >= packetsBeforeAck {
if h.logger.Debug() {
h.logger.Debugf("\tQueueing ACK because packet %d packets were received after the last ACK (using initial threshold: %d).", h.ackElicitingPacketsReceivedSinceLastAck, packetsBeforeAck)
}
h.ackQueued = true
} else if h.ackAlarm.IsZero() {
if h.logger.Debug() {
h.logger.Debugf("\tSetting ACK timer to max ack delay: %s", h.maxAckDelay)
}
h.ackAlarm = rcvTime.Add(h.maxAckDelay)
} }
h.ackQueued = true
// Queue an ACK if there are new missing packets to report. } else if h.ackAlarm.IsZero() {
if h.hasNewMissingPackets() { if h.logger.Debug() {
h.ackQueued = true h.logger.Debugf("\tSetting ACK timer to max ack delay: %s", h.maxAckDelay)
} }
h.ackAlarm = rcvTime.Add(h.maxAckDelay)
}
// Queue an ACK if there are new missing packets to report.
if h.hasNewMissingPackets() {
h.logger.Debugf("\tQueuing ACK because there's a new missing packet to report.")
h.ackQueued = true
} }
if h.ackQueued { if h.ackQueued {

2
internal/ackhandler/received_packet_tracker_test.go
View File

@@ -117,7 +117,7 @@ var _ = Describe("Received Packet Tracker", func() {
Expect(ack).ToNot(BeNil()) Expect(ack).ToNot(BeNil())
Expect(ack.HasMissingRanges()).To(BeTrue()) Expect(ack.HasMissingRanges()).To(BeTrue())
Expect(tracker.ackQueued).To(BeFalse()) Expect(tracker.ackQueued).To(BeFalse())
tracker.ReceivedPacket(12, time.Now(), false) tracker.ReceivedPacket(12, time.Now(), true)
Expect(tracker.ackQueued).To(BeTrue()) Expect(tracker.ackQueued).To(BeTrue())
}) })