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

rename packetHistory to receivedTimes in new ReceivedPacketHandler

Browse Source
This commit is contained in:
Marten Seemann
2016-06-27 15:31:44 +07:00
parent 7da4e3e5fb
commit be51851ef6
2 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ackhandlernew/received_packet_handler.go
View File

@@ -23,14 +23,14 @@ type receivedPacketHandler struct {
currentAckFrame *frames.AckFrameNew currentAckFrame *frames.AckFrameNew
stateChanged bool // has an ACK for this state already been sent? Will be set to false every time a new packet arrives, and to false every time an ACK is sent stateChanged bool // has an ACK for this state already been sent? Will be set to false every time a new packet arrives, and to false every time an ACK is sent
packetHistory map[protocol.PacketNumber]time.Time receivedTimes map[protocol.PacketNumber]time.Time
lowestInPacketHistory protocol.PacketNumber lowestInReceivedTimes protocol.PacketNumber
} }
// NewReceivedPacketHandler creates a new receivedPacketHandler // NewReceivedPacketHandler creates a new receivedPacketHandler
func NewReceivedPacketHandler() ReceivedPacketHandler { func NewReceivedPacketHandler() ReceivedPacketHandler {
return &receivedPacketHandler{ return &receivedPacketHandler{
packetHistory: make(map[protocol.PacketNumber]time.Time), receivedTimes: make(map[protocol.PacketNumber]time.Time),
} }
} }
@@ -38,7 +38,7 @@ func (h *receivedPacketHandler) ReceivedPacket(packetNumber protocol.PacketNumbe
if packetNumber == 0 { if packetNumber == 0 {
return errInvalidPacketNumber return errInvalidPacketNumber
} }
_, ok := h.packetHistory[packetNumber] _, ok := h.receivedTimes[packetNumber]
if packetNumber <= h.highestInOrderObserved || ok { if packetNumber <= h.highestInOrderObserved || ok {
return ErrDuplicatePacket return ErrDuplicatePacket
} }
@@ -55,11 +55,11 @@ func (h *receivedPacketHandler) ReceivedPacket(packetNumber protocol.PacketNumbe
// h.highestInOrderObserved = packetNumber // h.highestInOrderObserved = packetNumber
// } // }
h.packetHistory[packetNumber] = time.Now() h.receivedTimes[packetNumber] = time.Now()
h.garbageCollect() h.garbageCollect()
if uint32(len(h.packetHistory)) > protocol.MaxTrackedReceivedPackets { if uint32(len(h.receivedTimes)) > protocol.MaxTrackedReceivedPackets {
return errTooManyOutstandingReceivedPackets return errTooManyOutstandingReceivedPackets
} }
@@ -87,7 +87,7 @@ func (h *receivedPacketHandler) getAckRanges() []frames.AckRange {
inRange := false inRange := false
for i := h.largestObserved; i > h.highestInOrderObserved; i-- { for i := h.largestObserved; i > h.highestInOrderObserved; i-- {
_, ok := h.packetHistory[i] _, ok := h.receivedTimes[i]
if ok { if ok {
if !inRange { if !inRange {
r := frames.AckRange{ r := frames.AckRange{
@@ -119,7 +119,7 @@ func (h *receivedPacketHandler) GetAckFrame(dequeue bool) (*frames.AckFrameNew,
return h.currentAckFrame, nil return h.currentAckFrame, nil
} }
packetReceivedTime, ok := h.packetHistory[h.largestObserved] packetReceivedTime, ok := h.receivedTimes[h.largestObserved]
if !ok { if !ok {
return nil, ErrMapAccess return nil, ErrMapAccess
} }
@@ -139,8 +139,8 @@ func (h *receivedPacketHandler) GetAckFrame(dequeue bool) (*frames.AckFrameNew,
} }
func (h *receivedPacketHandler) garbageCollect() { func (h *receivedPacketHandler) garbageCollect() {
for i := h.lowestInPacketHistory; i < h.highestInOrderObserved; i++ { for i := h.lowestInReceivedTimes; i < h.highestInOrderObserved; i++ {
delete(h.packetHistory, i) delete(h.receivedTimes, i)
} }
h.lowestInPacketHistory = h.highestInOrderObserved h.lowestInReceivedTimes = h.highestInOrderObserved
} }

22
ackhandlernew/received_packet_handler_test.go
View File

@@ -23,13 +23,13 @@ var _ = Describe("receivedPacketHandler", func() {
It("handles a packet that arrives late", func() { It("handles a packet that arrives late", func() {
err := handler.ReceivedPacket(protocol.PacketNumber(1)) err := handler.ReceivedPacket(protocol.PacketNumber(1))
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
Expect(handler.packetHistory).To(HaveKey(protocol.PacketNumber(1))) Expect(handler.receivedTimes).To(HaveKey(protocol.PacketNumber(1)))
err = handler.ReceivedPacket(protocol.PacketNumber(3)) err = handler.ReceivedPacket(protocol.PacketNumber(3))
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
Expect(handler.packetHistory).To(HaveKey(protocol.PacketNumber(3))) Expect(handler.receivedTimes).To(HaveKey(protocol.PacketNumber(3)))
err = handler.ReceivedPacket(protocol.PacketNumber(2)) err = handler.ReceivedPacket(protocol.PacketNumber(2))
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
Expect(handler.packetHistory).To(HaveKey(protocol.PacketNumber(2))) Expect(handler.receivedTimes).To(HaveKey(protocol.PacketNumber(2)))
}) })
It("rejects packets with packet number 0", func() { It("rejects packets with packet number 0", func() {
@@ -58,8 +58,8 @@ var _ = Describe("receivedPacketHandler", func() {
It("saves the time when each packet arrived", func() { It("saves the time when each packet arrived", func() {
err := handler.ReceivedPacket(protocol.PacketNumber(3)) err := handler.ReceivedPacket(protocol.PacketNumber(3))
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
Expect(handler.packetHistory).To(HaveKey(protocol.PacketNumber(3))) Expect(handler.receivedTimes).To(HaveKey(protocol.PacketNumber(3)))
Expect(handler.packetHistory[3]).To(BeTemporally("~", time.Now(), 10*time.Millisecond)) Expect(handler.receivedTimes[3]).To(BeTemporally("~", time.Now(), 10*time.Millisecond))
}) })
It("doesn't store more than MaxTrackedReceivedPackets packets", func() { It("doesn't store more than MaxTrackedReceivedPackets packets", func() {
@@ -280,9 +280,9 @@ var _ = Describe("receivedPacketHandler", func() {
handler.ReceivedPacket(1) handler.ReceivedPacket(1)
handler.ReceivedPacket(2) handler.ReceivedPacket(2)
handler.ReceivedPacket(4) handler.ReceivedPacket(4)
Expect(handler.packetHistory).ToNot(HaveKey(protocol.PacketNumber(1))) Expect(handler.receivedTimes).ToNot(HaveKey(protocol.PacketNumber(1)))
Expect(handler.packetHistory).To(HaveKey(protocol.PacketNumber(2))) Expect(handler.receivedTimes).To(HaveKey(protocol.PacketNumber(2)))
Expect(handler.packetHistory).To(HaveKey(protocol.PacketNumber(4))) Expect(handler.receivedTimes).To(HaveKey(protocol.PacketNumber(4)))
}) })
It("garbage collects packetHistory after receiving a StopWaiting", func() { It("garbage collects packetHistory after receiving a StopWaiting", func() {
@@ -291,9 +291,9 @@ var _ = Describe("receivedPacketHandler", func() {
handler.ReceivedPacket(4) handler.ReceivedPacket(4)
swf := frames.StopWaitingFrame{LeastUnacked: 4} swf := frames.StopWaitingFrame{LeastUnacked: 4}
handler.ReceivedStopWaiting(&swf) handler.ReceivedStopWaiting(&swf)
Expect(handler.packetHistory).ToNot(HaveKey(protocol.PacketNumber(1))) Expect(handler.receivedTimes).ToNot(HaveKey(protocol.PacketNumber(1)))
Expect(handler.packetHistory).ToNot(HaveKey(protocol.PacketNumber(2))) Expect(handler.receivedTimes).ToNot(HaveKey(protocol.PacketNumber(2)))
Expect(handler.packetHistory).To(HaveKey(protocol.PacketNumber(4))) Expect(handler.receivedTimes).To(HaveKey(protocol.PacketNumber(4)))
}) })
}) })
}) })