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

rename highestInOrderAckedPacketNumber in new SentPacketHandler

Browse Source
This commit is contained in:
Marten Seemann
2016-06-25 17:13:48 +07:00
parent fe1fb7a5f4
commit dbf76815f4
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ackhandlernew/sent_packet_handler.go
View File

@@ -31,7 +31,7 @@ var (
type sentPacketHandler struct { type sentPacketHandler struct {
lastSentPacketNumber protocol.PacketNumber lastSentPacketNumber protocol.PacketNumber
lastSentPacketTime time.Time lastSentPacketTime time.Time
highestInOrderAckedPacketNumber protocol.PacketNumber LargestInOrderAcked protocol.PacketNumber
LargestAcked protocol.PacketNumber LargestAcked protocol.PacketNumber
// TODO: Move into separate class as in chromium // TODO: Move into separate class as in chromium
@@ -72,8 +72,8 @@ func (h *sentPacketHandler) ackPacket(packetNumber protocol.PacketNumber) *Packe
h.bytesInFlight -= packet.Length h.bytesInFlight -= packet.Length
} }
if h.highestInOrderAckedPacketNumber == packetNumber-1 { if h.LargestInOrderAcked == packetNumber-1 {
h.highestInOrderAckedPacketNumber++ h.LargestInOrderAcked++
} }
delete(h.packetHistory, packetNumber) delete(h.packetHistory, packetNumber)
@@ -264,7 +264,7 @@ func (h *sentPacketHandler) maybeQueuePacketsRTO() {
return return
} }
for p := h.highestInOrderAckedPacketNumber + 1; p <= h.lastSentPacketNumber; p++ { for p := h.LargestInOrderAcked + 1; p <= h.lastSentPacketNumber; p++ {
packet := h.packetHistory[p] packet := h.packetHistory[p]
if packet != nil && !packet.Retransmitted { if packet != nil && !packet.Retransmitted {
packetsLost := congestion.PacketVector{congestion.PacketInfo{ packetsLost := congestion.PacketVector{congestion.PacketInfo{

16
ackhandlernew/sent_packet_handler_test.go
View File

@@ -223,14 +223,14 @@ var _ = Describe("SentPacketHandler", func() {
Context("acks and nacks the right packets", func() { Context("acks and nacks the right packets", func() {
// if a packet is ACKed, it's removed from the packet history // if a packet is ACKed, it's removed from the packet history
It("adjusts the highestInOrderAckedPacketNumber", func() { It("adjusts the LargestInOrderAcked", func() {
ack := frames.AckFrameNew{ ack := frames.AckFrameNew{
LargestAcked: 5, LargestAcked: 5,
LowestAcked: 1, LowestAcked: 1,
} }
err := handler.ReceivedAck(&ack) err := handler.ReceivedAck(&ack)
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
Expect(handler.highestInOrderAckedPacketNumber).To(Equal(protocol.PacketNumber(5))) Expect(handler.LargestInOrderAcked).To(Equal(protocol.PacketNumber(5)))
for i := 1; i <= 5; i++ { for i := 1; i <= 5; i++ {
Expect(handler.packetHistory).ToNot(HaveKey(protocol.PacketNumber(i))) Expect(handler.packetHistory).ToNot(HaveKey(protocol.PacketNumber(i)))
} }
@@ -247,7 +247,7 @@ var _ = Describe("SentPacketHandler", func() {
} }
err := handler.ReceivedAck(&ack) err := handler.ReceivedAck(&ack)
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
Expect(handler.highestInOrderAckedPacketNumber).To(Equal(protocol.PacketNumber(0))) Expect(handler.LargestInOrderAcked).To(Equal(protocol.PacketNumber(0)))
Expect(handler.packetHistory).To(HaveKey(protocol.PacketNumber(1))) Expect(handler.packetHistory).To(HaveKey(protocol.PacketNumber(1)))
Expect(handler.packetHistory[1].MissingReports).To(BeZero()) Expect(handler.packetHistory[1].MissingReports).To(BeZero())
for i := 2; i <= 8; i++ { for i := 2; i <= 8; i++ {
@@ -270,7 +270,7 @@ var _ = Describe("SentPacketHandler", func() {
} }
err := handler.ReceivedAck(&ack) err := handler.ReceivedAck(&ack)
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
Expect(handler.highestInOrderAckedPacketNumber).To(Equal(protocol.PacketNumber(0))) Expect(handler.LargestInOrderAcked).To(Equal(protocol.PacketNumber(0)))
Expect(handler.packetHistory).To(HaveKey(protocol.PacketNumber(1))) Expect(handler.packetHistory).To(HaveKey(protocol.PacketNumber(1)))
Expect(handler.packetHistory[1].MissingReports).To(BeZero()) Expect(handler.packetHistory[1].MissingReports).To(BeZero())
for i := 2; i <= 3; i++ { for i := 2; i <= 3; i++ {
@@ -300,7 +300,7 @@ var _ = Describe("SentPacketHandler", func() {
} }
err := handler.ReceivedAck(&ack) err := handler.ReceivedAck(&ack)
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
Expect(handler.highestInOrderAckedPacketNumber).To(Equal(protocol.PacketNumber(1))) Expect(handler.LargestInOrderAcked).To(Equal(protocol.PacketNumber(1)))
Expect(handler.packetHistory).ToNot(HaveKey(protocol.PacketNumber(1))) Expect(handler.packetHistory).ToNot(HaveKey(protocol.PacketNumber(1)))
Expect(handler.packetHistory).ToNot(HaveKey(protocol.PacketNumber(3))) Expect(handler.packetHistory).ToNot(HaveKey(protocol.PacketNumber(3)))
Expect(handler.packetHistory).ToNot(HaveKey(protocol.PacketNumber(6))) Expect(handler.packetHistory).ToNot(HaveKey(protocol.PacketNumber(6)))
@@ -442,7 +442,7 @@ var _ = Describe("SentPacketHandler", func() {
Expect(handler.DequeuePacketForRetransmission()).To(BeNil()) Expect(handler.DequeuePacketForRetransmission()).To(BeNil())
}) })
It("does not change the highestInOrderAckedPacketNumber after queueing a retransmission", func() { It("does not change the LargestInOrderAcked after queueing a retransmission", func() {
ack := frames.AckFrameNew{ ack := frames.AckFrameNew{
LargestAcked: 4, LargestAcked: 4,
LowestAcked: 1, LowestAcked: 1,
@@ -453,9 +453,9 @@ var _ = Describe("SentPacketHandler", func() {
} }
err := handler.ReceivedAck(&ack) err := handler.ReceivedAck(&ack)
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
Expect(handler.highestInOrderAckedPacketNumber).To(Equal(protocol.PacketNumber(2))) Expect(handler.LargestInOrderAcked).To(Equal(protocol.PacketNumber(2)))
handler.nackPacket(3) // this is the second NACK for this packet handler.nackPacket(3) // this is the second NACK for this packet
Expect(handler.highestInOrderAckedPacketNumber).To(Equal(protocol.PacketNumber(2))) Expect(handler.LargestInOrderAcked).To(Equal(protocol.PacketNumber(2)))
}) })
It("does not retransmit a packet if a belated ACK was received", func() { It("does not retransmit a packet if a belated ACK was received", func() {