From 864105271e957d56aca604a65353339e36605526 Mon Sep 17 00:00:00 2001 From: Lucas Clemente Date: Sun, 15 May 2016 15:27:39 +0200 Subject: [PATCH] privatize streamFrameQueue ref #60 --- packet_packer.go | 2 +- stream_frame_queue.go | 14 +++++++------- stream_frame_queue_test.go | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/packet_packer.go b/packet_packer.go index 3ed802488..d26385fdb 100644 --- a/packet_packer.go +++ b/packet_packer.go @@ -27,7 +27,7 @@ type packetPacker struct { sentPacketHandler ackhandler.SentPacketHandler connectionParametersManager *handshake.ConnectionParametersManager - streamFrameQueue StreamFrameQueue + streamFrameQueue streamFrameQueue controlFrames []frames.Frame lastPacketNumber protocol.PacketNumber diff --git a/stream_frame_queue.go b/stream_frame_queue.go index b09ec4cb8..9998f9892 100644 --- a/stream_frame_queue.go +++ b/stream_frame_queue.go @@ -7,15 +7,15 @@ import ( "github.com/lucas-clemente/quic-go/protocol" ) -// StreamFrameQueue is a Queue that handles StreamFrames -type StreamFrameQueue struct { +// streamFrameQueue is a Queue that handles StreamFrames +type streamFrameQueue struct { prioFrames []*frames.StreamFrame frames []*frames.StreamFrame mutex sync.Mutex } // Push adds a new StreamFrame to the queue -func (q *StreamFrameQueue) Push(frame *frames.StreamFrame, prio bool) { +func (q *streamFrameQueue) Push(frame *frames.StreamFrame, prio bool) { q.mutex.Lock() defer q.mutex.Unlock() @@ -27,7 +27,7 @@ func (q *StreamFrameQueue) Push(frame *frames.StreamFrame, prio bool) { } // Len returns the total number of queued StreamFrames -func (q *StreamFrameQueue) Len() int { +func (q *streamFrameQueue) Len() int { q.mutex.Lock() defer q.mutex.Unlock() @@ -35,7 +35,7 @@ func (q *StreamFrameQueue) Len() int { } // ByteLen returns the total number of bytes queued -func (q *StreamFrameQueue) ByteLen() protocol.ByteCount { +func (q *streamFrameQueue) ByteLen() protocol.ByteCount { q.mutex.Lock() defer q.mutex.Unlock() @@ -53,7 +53,7 @@ func (q *StreamFrameQueue) ByteLen() protocol.ByteCount { } // Pop returns the next element and deletes it from the queue -func (q *StreamFrameQueue) Pop() *frames.StreamFrame { +func (q *streamFrameQueue) Pop() *frames.StreamFrame { q.mutex.Lock() defer q.mutex.Unlock() @@ -71,7 +71,7 @@ func (q *StreamFrameQueue) Pop() *frames.StreamFrame { } // Front returns the next element without modifying the queue -func (q *StreamFrameQueue) Front() *frames.StreamFrame { +func (q *streamFrameQueue) Front() *frames.StreamFrame { q.mutex.Lock() defer q.mutex.Unlock() diff --git a/stream_frame_queue_test.go b/stream_frame_queue_test.go index 38da1086c..5c6f9dd02 100644 --- a/stream_frame_queue_test.go +++ b/stream_frame_queue_test.go @@ -7,13 +7,13 @@ import ( . "github.com/onsi/gomega" ) -var _ = Describe("StreamFrameQueue", func() { +var _ = Describe("streamFrameQueue", func() { var prioFrame1, prioFrame2 *frames.StreamFrame var frame1, frame2 *frames.StreamFrame - var queue *StreamFrameQueue + var queue *streamFrameQueue BeforeEach(func() { - queue = &StreamFrameQueue{} + queue = &streamFrameQueue{} prioFrame1 = &frames.StreamFrame{ StreamID: 5, Data: []byte{0x13, 0x37},