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

use a generic linked list (#3487)

Browse Source
This commit is contained in:
Marten Seemann
2022-08-10 18:50:21 +02:00
committed by GitHub
parent ea9de26ed5
commit 7ebe1430ef
17 changed files with 201 additions and 1078 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
internal/ackhandler/received_packet_history_test.go
View File

@@ -6,8 +6,8 @@ import (
"sort"
"github.com/lucas-clemente/quic-go/internal/protocol"
"github.com/lucas-clemente/quic-go/internal/utils"
"github.com/lucas-clemente/quic-go/internal/wire"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
)
@@ -23,14 +23,14 @@ var _ = Describe("receivedPacketHistory", func() {
It("adds the first packet", func() {
Expect(hist.ReceivedPacket(4)).To(BeTrue())
Expect(hist.ranges.Len()).To(Equal(1))
Expect(hist.ranges.Front().Value).To(Equal(utils.PacketInterval{Start: 4, End: 4}))
Expect(hist.ranges.Front().Value).To(Equal(interval{Start: 4, End: 4}))
})
It("doesn't care about duplicate packets", func() {
Expect(hist.ReceivedPacket(4)).To(BeTrue())
Expect(hist.ReceivedPacket(4)).To(BeFalse())
Expect(hist.ranges.Len()).To(Equal(1))
Expect(hist.ranges.Front().Value).To(Equal(utils.PacketInterval{Start: 4, End: 4}))
Expect(hist.ranges.Front().Value).To(Equal(interval{Start: 4, End: 4}))
})
It("adds a few consecutive packets", func() {
@@ -38,7 +38,7 @@ var _ = Describe("receivedPacketHistory", func() {
Expect(hist.ReceivedPacket(5)).To(BeTrue())
Expect(hist.ReceivedPacket(6)).To(BeTrue())
Expect(hist.ranges.Len()).To(Equal(1))
Expect(hist.ranges.Front().Value).To(Equal(utils.PacketInterval{Start: 4, End: 6}))
Expect(hist.ranges.Front().Value).To(Equal(interval{Start: 4, End: 6}))
})
It("doesn't care about a duplicate packet contained in an existing range", func() {
@@ -47,22 +47,22 @@ var _ = Describe("receivedPacketHistory", func() {
Expect(hist.ReceivedPacket(6)).To(BeTrue())
Expect(hist.ReceivedPacket(5)).To(BeFalse())
Expect(hist.ranges.Len()).To(Equal(1))
Expect(hist.ranges.Front().Value).To(Equal(utils.PacketInterval{Start: 4, End: 6}))
Expect(hist.ranges.Front().Value).To(Equal(interval{Start: 4, End: 6}))
})
It("extends a range at the front", func() {
Expect(hist.ReceivedPacket(4)).To(BeTrue())
Expect(hist.ReceivedPacket(3)).To(BeTrue())
Expect(hist.ranges.Len()).To(Equal(1))
Expect(hist.ranges.Front().Value).To(Equal(utils.PacketInterval{Start: 3, End: 4}))
Expect(hist.ranges.Front().Value).To(Equal(interval{Start: 3, End: 4}))
})
It("creates a new range when a packet is lost", func() {
Expect(hist.ReceivedPacket(4)).To(BeTrue())
Expect(hist.ReceivedPacket(6)).To(BeTrue())
Expect(hist.ranges.Len()).To(Equal(2))
Expect(hist.ranges.Front().Value).To(Equal(utils.PacketInterval{Start: 4, End: 4}))
Expect(hist.ranges.Back().Value).To(Equal(utils.PacketInterval{Start: 6, End: 6}))
Expect(hist.ranges.Front().Value).To(Equal(interval{Start: 4, End: 4}))
Expect(hist.ranges.Back().Value).To(Equal(interval{Start: 6, End: 6}))
})
It("creates a new range in between two ranges", func() {
@@ -71,17 +71,17 @@ var _ = Describe("receivedPacketHistory", func() {
Expect(hist.ranges.Len()).To(Equal(2))
Expect(hist.ReceivedPacket(7)).To(BeTrue())
Expect(hist.ranges.Len()).To(Equal(3))
Expect(hist.ranges.Front().Value).To(Equal(utils.PacketInterval{Start: 4, End: 4}))
Expect(hist.ranges.Front().Next().Value).To(Equal(utils.PacketInterval{Start: 7, End: 7}))
Expect(hist.ranges.Back().Value).To(Equal(utils.PacketInterval{Start: 10, End: 10}))
Expect(hist.ranges.Front().Value).To(Equal(interval{Start: 4, End: 4}))
Expect(hist.ranges.Front().Next().Value).To(Equal(interval{Start: 7, End: 7}))
Expect(hist.ranges.Back().Value).To(Equal(interval{Start: 10, End: 10}))
})
It("creates a new range before an existing range for a belated packet", func() {
Expect(hist.ReceivedPacket(6)).To(BeTrue())
Expect(hist.ReceivedPacket(4)).To(BeTrue())
Expect(hist.ranges.Len()).To(Equal(2))
Expect(hist.ranges.Front().Value).To(Equal(utils.PacketInterval{Start: 4, End: 4}))
Expect(hist.ranges.Back().Value).To(Equal(utils.PacketInterval{Start: 6, End: 6}))
Expect(hist.ranges.Front().Value).To(Equal(interval{Start: 4, End: 4}))
Expect(hist.ranges.Back().Value).To(Equal(interval{Start: 6, End: 6}))
})
It("extends a previous range at the end", func() {
@@ -89,8 +89,8 @@ var _ = Describe("receivedPacketHistory", func() {
Expect(hist.ReceivedPacket(7)).To(BeTrue())
Expect(hist.ReceivedPacket(5)).To(BeTrue())
Expect(hist.ranges.Len()).To(Equal(2))
Expect(hist.ranges.Front().Value).To(Equal(utils.PacketInterval{Start: 4, End: 5}))
Expect(hist.ranges.Back().Value).To(Equal(utils.PacketInterval{Start: 7, End: 7}))
Expect(hist.ranges.Front().Value).To(Equal(interval{Start: 4, End: 5}))
Expect(hist.ranges.Back().Value).To(Equal(interval{Start: 7, End: 7}))
})
It("extends a range at the front", func() {
@@ -98,8 +98,8 @@ var _ = Describe("receivedPacketHistory", func() {
Expect(hist.ReceivedPacket(7)).To(BeTrue())
Expect(hist.ReceivedPacket(6)).To(BeTrue())
Expect(hist.ranges.Len()).To(Equal(2))
Expect(hist.ranges.Front().Value).To(Equal(utils.PacketInterval{Start: 4, End: 4}))
Expect(hist.ranges.Back().Value).To(Equal(utils.PacketInterval{Start: 6, End: 7}))
Expect(hist.ranges.Front().Value).To(Equal(interval{Start: 4, End: 4}))
Expect(hist.ranges.Back().Value).To(Equal(interval{Start: 6, End: 7}))
})
It("closes a range", func() {
@@ -108,7 +108,7 @@ var _ = Describe("receivedPacketHistory", func() {
Expect(hist.ranges.Len()).To(Equal(2))
Expect(hist.ReceivedPacket(5)).To(BeTrue())
Expect(hist.ranges.Len()).To(Equal(1))
Expect(hist.ranges.Front().Value).To(Equal(utils.PacketInterval{Start: 4, End: 6}))
Expect(hist.ranges.Front().Value).To(Equal(interval{Start: 4, End: 6}))
})
It("closes a range in the middle", func() {
@@ -119,9 +119,9 @@ var _ = Describe("receivedPacketHistory", func() {
Expect(hist.ranges.Len()).To(Equal(4))
Expect(hist.ReceivedPacket(5)).To(BeTrue())
Expect(hist.ranges.Len()).To(Equal(3))
Expect(hist.ranges.Front().Value).To(Equal(utils.PacketInterval{Start: 1, End: 1}))
Expect(hist.ranges.Front().Next().Value).To(Equal(utils.PacketInterval{Start: 4, End: 6}))
Expect(hist.ranges.Back().Value).To(Equal(utils.PacketInterval{Start: 10, End: 10}))
Expect(hist.ranges.Front().Value).To(Equal(interval{Start: 1, End: 1}))
Expect(hist.ranges.Front().Next().Value).To(Equal(interval{Start: 4, End: 6}))
Expect(hist.ranges.Back().Value).To(Equal(interval{Start: 10, End: 10}))
})
})
@@ -137,7 +137,7 @@ var _ = Describe("receivedPacketHistory", func() {
Expect(hist.ReceivedPacket(10)).To(BeTrue())
hist.DeleteBelow(6)
Expect(hist.ranges.Len()).To(Equal(1))
Expect(hist.ranges.Front().Value).To(Equal(utils.PacketInterval{Start: 10, End: 10}))
Expect(hist.ranges.Front().Value).To(Equal(interval{Start: 10, End: 10}))
})
It("deletes multiple ranges", func() {
@@ -146,7 +146,7 @@ var _ = Describe("receivedPacketHistory", func() {
Expect(hist.ReceivedPacket(10)).To(BeTrue())
hist.DeleteBelow(8)
Expect(hist.ranges.Len()).To(Equal(1))
Expect(hist.ranges.Front().Value).To(Equal(utils.PacketInterval{Start: 10, End: 10}))
Expect(hist.ranges.Front().Value).To(Equal(interval{Start: 10, End: 10}))
})
It("adjusts a range, if packets are delete from an existing range", func() {
@@ -157,7 +157,7 @@ var _ = Describe("receivedPacketHistory", func() {
Expect(hist.ReceivedPacket(7)).To(BeTrue())
hist.DeleteBelow(5)
Expect(hist.ranges.Len()).To(Equal(1))
Expect(hist.ranges.Front().Value).To(Equal(utils.PacketInterval{Start: 5, End: 7}))
Expect(hist.ranges.Front().Value).To(Equal(interval{Start: 5, End: 7}))
})
It("adjusts a range, if only one packet remains in the range", func() {
@@ -166,15 +166,15 @@ var _ = Describe("receivedPacketHistory", func() {
Expect(hist.ReceivedPacket(10)).To(BeTrue())
hist.DeleteBelow(5)
Expect(hist.ranges.Len()).To(Equal(2))
Expect(hist.ranges.Front().Value).To(Equal(utils.PacketInterval{Start: 5, End: 5}))
Expect(hist.ranges.Back().Value).To(Equal(utils.PacketInterval{Start: 10, End: 10}))
Expect(hist.ranges.Front().Value).To(Equal(interval{Start: 5, End: 5}))
Expect(hist.ranges.Back().Value).To(Equal(interval{Start: 10, End: 10}))
})
It("keeps a one-packet range, if deleting up to the packet directly below", func() {
Expect(hist.ReceivedPacket(4)).To(BeTrue())
hist.DeleteBelow(4)
Expect(hist.ranges.Len()).To(Equal(1))
Expect(hist.ranges.Front().Value).To(Equal(utils.PacketInterval{Start: 4, End: 4}))
Expect(hist.ranges.Front().Value).To(Equal(interval{Start: 4, End: 4}))
})
It("doesn't add delayed packets below deleted ranges", func() {
@@ -183,10 +183,10 @@ var _ = Describe("receivedPacketHistory", func() {
Expect(hist.ReceivedPacket(6)).To(BeTrue())
hist.DeleteBelow(5)
Expect(hist.ranges.Len()).To(Equal(1))
Expect(hist.ranges.Front().Value).To(Equal(utils.PacketInterval{Start: 5, End: 6}))
Expect(hist.ranges.Front().Value).To(Equal(interval{Start: 5, End: 6}))
Expect(hist.ReceivedPacket(2)).To(BeFalse())
Expect(hist.ranges.Len()).To(Equal(1))
Expect(hist.ranges.Front().Value).To(Equal(utils.PacketInterval{Start: 5, End: 6}))
Expect(hist.ranges.Front().Value).To(Equal(interval{Start: 5, End: 6}))
})
It("doesn't create more than MaxNumAckRanges ranges", func() {
@@ -194,11 +194,11 @@ var _ = Describe("receivedPacketHistory", func() {
Expect(hist.ReceivedPacket(2 * i)).To(BeTrue())
}
Expect(hist.ranges.Len()).To(Equal(protocol.MaxNumAckRanges))
Expect(hist.ranges.Front().Value).To(Equal(utils.PacketInterval{Start: 0, End: 0}))
Expect(hist.ranges.Front().Value).To(Equal(interval{Start: 0, End: 0}))
hist.ReceivedPacket(2*protocol.MaxNumAckRanges + 1000)
// check that the oldest ACK range was deleted
Expect(hist.ranges.Len()).To(Equal(protocol.MaxNumAckRanges))
Expect(hist.ranges.Front().Value).To(Equal(utils.PacketInterval{Start: 2, End: 2}))
Expect(hist.ranges.Front().Value).To(Equal(interval{Start: 2, End: 2}))
})
})