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

store NackRanges instead of pointers to NackRanges

Browse Source
This commit is contained in:
Marten Seemann
2016-04-22 17:27:53 +07:00
parent 6caf1f74e3
commit 62a844d326
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ackhandler/incoming_packet_ack_handler.go
View File

@@ -37,16 +37,16 @@ func (h *incomingPacketAckHandler) ReceivedPacket(packetNumber protocol.PacketNu
return nil
}
// GetNackRanges gets all the NACK ranges
func (h *incomingPacketAckHandler) GetNackRanges() []*frames.NackRange {
// getNackRanges gets all the NACK ranges
func (h *incomingPacketAckHandler) getNackRanges() []frames.NackRange {
// ToDo: improve performance
var ranges []*frames.NackRange
var ranges []frames.NackRange
inRange := false
for i := protocol.PacketNumber(1); i < h.largestObserved; i++ {
_, ok := h.observed[i]
if !ok {
if !inRange {
r := &frames.NackRange{
r := frames.NackRange{
FirstPacketNumber: i,
LastPacketNumber: i,
}

12
ackhandler/incoming_packet_ack_handler_test.go
View File

@@ -20,7 +20,7 @@ var _ = Describe("incomingPacketAckHandler", func() {
Expect(err).ToNot(HaveOccurred())
}
Expect(handler.largestObserved).To(Equal(protocol.PacketNumber(99)))
Expect(len(handler.GetNackRanges())).To(Equal(0))
Expect(len(handler.getNackRanges())).To(Equal(0))
})
It("handles a single lost package", func() {
@@ -31,7 +31,7 @@ var _ = Describe("incomingPacketAckHandler", func() {
handler.ReceivedPacket(protocol.PacketNumber(i), false)
}
Expect(handler.largestObserved).To(Equal(protocol.PacketNumber(9)))
nackRanges := handler.GetNackRanges()
nackRanges := handler.getNackRanges()
Expect(len(nackRanges)).To(Equal(1))
Expect(nackRanges[0].FirstPacketNumber).To(Equal(protocol.PacketNumber(5)))
Expect(nackRanges[0].LastPacketNumber).To(Equal(protocol.PacketNumber(5)))
@@ -45,7 +45,7 @@ var _ = Describe("incomingPacketAckHandler", func() {
handler.ReceivedPacket(protocol.PacketNumber(i), false)
}
Expect(handler.largestObserved).To(Equal(protocol.PacketNumber(9)))
nackRanges := handler.GetNackRanges()
nackRanges := handler.getNackRanges()
Expect(len(nackRanges)).To(Equal(1))
Expect(nackRanges[0].FirstPacketNumber).To(Equal(protocol.PacketNumber(5)))
Expect(nackRanges[0].LastPacketNumber).To(Equal(protocol.PacketNumber(6)))
@@ -59,7 +59,7 @@ var _ = Describe("incomingPacketAckHandler", func() {
handler.ReceivedPacket(protocol.PacketNumber(i), false)
}
Expect(handler.largestObserved).To(Equal(protocol.PacketNumber(9)))
nackRanges := handler.GetNackRanges()
nackRanges := handler.getNackRanges()
Expect(len(nackRanges)).To(Equal(2))
Expect(nackRanges[0].FirstPacketNumber).To(Equal(protocol.PacketNumber(3)))
Expect(nackRanges[0].LastPacketNumber).To(Equal(protocol.PacketNumber(3)))
@@ -75,7 +75,7 @@ var _ = Describe("incomingPacketAckHandler", func() {
handler.ReceivedPacket(protocol.PacketNumber(i), false)
}
Expect(handler.largestObserved).To(Equal(protocol.PacketNumber(9)))
nackRanges := handler.GetNackRanges()
nackRanges := handler.getNackRanges()
Expect(len(nackRanges)).To(Equal(2))
Expect(nackRanges[0].FirstPacketNumber).To(Equal(protocol.PacketNumber(2)))
Expect(nackRanges[0].LastPacketNumber).To(Equal(protocol.PacketNumber(4)))
@@ -90,7 +90,7 @@ var _ = Describe("incomingPacketAckHandler", func() {
Expect(err).ToNot(HaveOccurred())
err = handler.ReceivedPacket(protocol.PacketNumber(2), false)
Expect(err).ToNot(HaveOccurred())
nackRanges := handler.GetNackRanges()
nackRanges := handler.getNackRanges()
Expect(len(nackRanges)).To(Equal(0))
})