From be51851ef6c8ba99a9484e81fc5cfee0490b65ed Mon Sep 17 00:00:00 2001 From: Marten Seemann Date: Mon, 27 Jun 2016 15:31:44 +0700 Subject: [PATCH] rename packetHistory to receivedTimes in new ReceivedPacketHandler --- ackhandlernew/received_packet_handler.go | 22 +++++++++---------- ackhandlernew/received_packet_handler_test.go | 22 +++++++++---------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/ackhandlernew/received_packet_handler.go b/ackhandlernew/received_packet_handler.go index 9ffacac19..9ec625d53 100644 --- a/ackhandlernew/received_packet_handler.go +++ b/ackhandlernew/received_packet_handler.go @@ -23,14 +23,14 @@ type receivedPacketHandler struct { 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 - packetHistory map[protocol.PacketNumber]time.Time - lowestInPacketHistory protocol.PacketNumber + receivedTimes map[protocol.PacketNumber]time.Time + lowestInReceivedTimes protocol.PacketNumber } // NewReceivedPacketHandler creates a new receivedPacketHandler func NewReceivedPacketHandler() 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 { return errInvalidPacketNumber } - _, ok := h.packetHistory[packetNumber] + _, ok := h.receivedTimes[packetNumber] if packetNumber <= h.highestInOrderObserved || ok { return ErrDuplicatePacket } @@ -55,11 +55,11 @@ func (h *receivedPacketHandler) ReceivedPacket(packetNumber protocol.PacketNumbe // h.highestInOrderObserved = packetNumber // } - h.packetHistory[packetNumber] = time.Now() + h.receivedTimes[packetNumber] = time.Now() h.garbageCollect() - if uint32(len(h.packetHistory)) > protocol.MaxTrackedReceivedPackets { + if uint32(len(h.receivedTimes)) > protocol.MaxTrackedReceivedPackets { return errTooManyOutstandingReceivedPackets } @@ -87,7 +87,7 @@ func (h *receivedPacketHandler) getAckRanges() []frames.AckRange { inRange := false for i := h.largestObserved; i > h.highestInOrderObserved; i-- { - _, ok := h.packetHistory[i] + _, ok := h.receivedTimes[i] if ok { if !inRange { r := frames.AckRange{ @@ -119,7 +119,7 @@ func (h *receivedPacketHandler) GetAckFrame(dequeue bool) (*frames.AckFrameNew, return h.currentAckFrame, nil } - packetReceivedTime, ok := h.packetHistory[h.largestObserved] + packetReceivedTime, ok := h.receivedTimes[h.largestObserved] if !ok { return nil, ErrMapAccess } @@ -139,8 +139,8 @@ func (h *receivedPacketHandler) GetAckFrame(dequeue bool) (*frames.AckFrameNew, } func (h *receivedPacketHandler) garbageCollect() { - for i := h.lowestInPacketHistory; i < h.highestInOrderObserved; i++ { - delete(h.packetHistory, i) + for i := h.lowestInReceivedTimes; i < h.highestInOrderObserved; i++ { + delete(h.receivedTimes, i) } - h.lowestInPacketHistory = h.highestInOrderObserved + h.lowestInReceivedTimes = h.highestInOrderObserved } diff --git a/ackhandlernew/received_packet_handler_test.go b/ackhandlernew/received_packet_handler_test.go index 1918fe66a..527c35a56 100644 --- a/ackhandlernew/received_packet_handler_test.go +++ b/ackhandlernew/received_packet_handler_test.go @@ -23,13 +23,13 @@ var _ = Describe("receivedPacketHandler", func() { It("handles a packet that arrives late", func() { err := handler.ReceivedPacket(protocol.PacketNumber(1)) 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)) 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)) 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() { @@ -58,8 +58,8 @@ var _ = Describe("receivedPacketHandler", func() { It("saves the time when each packet arrived", func() { err := handler.ReceivedPacket(protocol.PacketNumber(3)) Expect(err).ToNot(HaveOccurred()) - Expect(handler.packetHistory).To(HaveKey(protocol.PacketNumber(3))) - Expect(handler.packetHistory[3]).To(BeTemporally("~", time.Now(), 10*time.Millisecond)) + Expect(handler.receivedTimes).To(HaveKey(protocol.PacketNumber(3))) + Expect(handler.receivedTimes[3]).To(BeTemporally("~", time.Now(), 10*time.Millisecond)) }) It("doesn't store more than MaxTrackedReceivedPackets packets", func() { @@ -280,9 +280,9 @@ var _ = Describe("receivedPacketHandler", func() { handler.ReceivedPacket(1) handler.ReceivedPacket(2) handler.ReceivedPacket(4) - Expect(handler.packetHistory).ToNot(HaveKey(protocol.PacketNumber(1))) - Expect(handler.packetHistory).To(HaveKey(protocol.PacketNumber(2))) - Expect(handler.packetHistory).To(HaveKey(protocol.PacketNumber(4))) + Expect(handler.receivedTimes).ToNot(HaveKey(protocol.PacketNumber(1))) + Expect(handler.receivedTimes).To(HaveKey(protocol.PacketNumber(2))) + Expect(handler.receivedTimes).To(HaveKey(protocol.PacketNumber(4))) }) It("garbage collects packetHistory after receiving a StopWaiting", func() { @@ -291,9 +291,9 @@ var _ = Describe("receivedPacketHandler", func() { handler.ReceivedPacket(4) swf := frames.StopWaitingFrame{LeastUnacked: 4} handler.ReceivedStopWaiting(&swf) - Expect(handler.packetHistory).ToNot(HaveKey(protocol.PacketNumber(1))) - Expect(handler.packetHistory).ToNot(HaveKey(protocol.PacketNumber(2))) - Expect(handler.packetHistory).To(HaveKey(protocol.PacketNumber(4))) + Expect(handler.receivedTimes).ToNot(HaveKey(protocol.PacketNumber(1))) + Expect(handler.receivedTimes).ToNot(HaveKey(protocol.PacketNumber(2))) + Expect(handler.receivedTimes).To(HaveKey(protocol.PacketNumber(4))) }) }) })