privatize streamFrameQueue

ref #60
This commit is contained in:
Lucas Clemente
2016-05-15 15:27:39 +02:00
parent 283cab4e0d
commit 864105271e
3 changed files with 11 additions and 11 deletions

View File

@@ -27,7 +27,7 @@ type packetPacker struct {
sentPacketHandler ackhandler.SentPacketHandler sentPacketHandler ackhandler.SentPacketHandler
connectionParametersManager *handshake.ConnectionParametersManager connectionParametersManager *handshake.ConnectionParametersManager
streamFrameQueue StreamFrameQueue streamFrameQueue streamFrameQueue
controlFrames []frames.Frame controlFrames []frames.Frame
lastPacketNumber protocol.PacketNumber lastPacketNumber protocol.PacketNumber

View File

@@ -7,15 +7,15 @@ import (
"github.com/lucas-clemente/quic-go/protocol" "github.com/lucas-clemente/quic-go/protocol"
) )
// StreamFrameQueue is a Queue that handles StreamFrames // streamFrameQueue is a Queue that handles StreamFrames
type StreamFrameQueue struct { type streamFrameQueue struct {
prioFrames []*frames.StreamFrame prioFrames []*frames.StreamFrame
frames []*frames.StreamFrame frames []*frames.StreamFrame
mutex sync.Mutex mutex sync.Mutex
} }
// Push adds a new StreamFrame to the queue // 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() q.mutex.Lock()
defer q.mutex.Unlock() 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 // Len returns the total number of queued StreamFrames
func (q *StreamFrameQueue) Len() int { func (q *streamFrameQueue) Len() int {
q.mutex.Lock() q.mutex.Lock()
defer q.mutex.Unlock() defer q.mutex.Unlock()
@@ -35,7 +35,7 @@ func (q *StreamFrameQueue) Len() int {
} }
// ByteLen returns the total number of bytes queued // ByteLen returns the total number of bytes queued
func (q *StreamFrameQueue) ByteLen() protocol.ByteCount { func (q *streamFrameQueue) ByteLen() protocol.ByteCount {
q.mutex.Lock() q.mutex.Lock()
defer q.mutex.Unlock() 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 // 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() q.mutex.Lock()
defer q.mutex.Unlock() defer q.mutex.Unlock()
@@ -71,7 +71,7 @@ func (q *StreamFrameQueue) Pop() *frames.StreamFrame {
} }
// Front returns the next element without modifying the queue // Front returns the next element without modifying the queue
func (q *StreamFrameQueue) Front() *frames.StreamFrame { func (q *streamFrameQueue) Front() *frames.StreamFrame {
q.mutex.Lock() q.mutex.Lock()
defer q.mutex.Unlock() defer q.mutex.Unlock()

View File

@@ -7,13 +7,13 @@ import (
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
) )
var _ = Describe("StreamFrameQueue", func() { var _ = Describe("streamFrameQueue", func() {
var prioFrame1, prioFrame2 *frames.StreamFrame var prioFrame1, prioFrame2 *frames.StreamFrame
var frame1, frame2 *frames.StreamFrame var frame1, frame2 *frames.StreamFrame
var queue *StreamFrameQueue var queue *streamFrameQueue
BeforeEach(func() { BeforeEach(func() {
queue = &StreamFrameQueue{} queue = &streamFrameQueue{}
prioFrame1 = &frames.StreamFrame{ prioFrame1 = &frames.StreamFrame{
StreamID: 5, StreamID: 5,
Data: []byte{0x13, 0x37}, Data: []byte{0x13, 0x37},