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

move splitting of StreamFrames to StreamFrameQueue

Browse Source 
work towards #146
This commit is contained in:
Marten Seemann
2016-05-26 11:14:38 +07:00
parent 93771708ae
commit 758334f6aa
5 changed files with 170 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

135
stream_frame_queue_test.go
View File

@@ -24,7 +24,7 @@ var _ = Describe("streamFrameQueue", func() {
}
frame1 = &frames.StreamFrame{
StreamID: 10,
Data: []byte{0xCA, 0xFE, 0x13},
Data: []byte{0xDE, 0xAD, 0xBE, 0xEF, 0xCA, 0xFE, 0x13, 0x37},
}
frame2 = &frames.StreamFrame{
StreamID: 11,
@@ -51,19 +51,19 @@ var _ = Describe("streamFrameQueue", func() {
queue.Push(frame1, false)
queue.Push(frame2, false)
Expect(queue.Len()).To(Equal(4))
queue.Pop()
queue.Pop(1000)
Expect(queue.Len()).To(Equal(3))
queue.Pop()
queue.Pop()
queue.Pop()
queue.Pop(1000)
queue.Pop(1000)
queue.Pop(1000)
Expect(queue.Len()).To(Equal(0))
})
It("does not change the length when using Front()", func() {
It("does not change the length when using front()", func() {
queue.Push(prioFrame1, true)
queue.Push(frame1, false)
Expect(queue.Len()).To(Equal(2))
queue.Front()
queue.front()
Expect(queue.Len()).To(Equal(2))
})
})
@@ -78,48 +78,45 @@ var _ = Describe("streamFrameQueue", func() {
Expect(queue.ByteLen()).To(Equal(protocol.ByteCount(2)))
queue.Push(frame1, false)
queue.Push(frame2, false)
Expect(queue.ByteLen()).To(Equal(protocol.ByteCount(2 + 3 + 5)))
Expect(queue.ByteLen()).To(Equal(protocol.ByteCount(len(prioFrame1.Data) + len(frame1.Data) + len(frame2.Data))))
})
It("returns the correct byte length when popping", func() {
queue.Push(prioFrame1, true)
queue.Push(prioFrame2, true)
queue.Push(frame1, false)
queue.Push(frame2, false)
Expect(queue.ByteLen()).To(Equal(protocol.ByteCount(2 + 4 + 3 + 5)))
queue.Pop()
Expect(queue.ByteLen()).To(Equal(protocol.ByteCount(4 + 3 + 5)))
queue.Pop()
queue.Pop()
queue.Pop()
Expect(queue.ByteLen()).To(Equal(protocol.ByteCount(len(prioFrame1.Data) + len(frame1.Data))))
queue.Pop(1000)
Expect(queue.ByteLen()).To(Equal(protocol.ByteCount(len(frame1.Data))))
queue.Pop(1000)
Expect(queue.ByteLen()).To(Equal(protocol.ByteCount(0)))
})
It("does not change the byte length when using Front()", func() {
queue.Push(prioFrame1, true)
queue.Push(frame1, false)
Expect(queue.ByteLen()).To(Equal(protocol.ByteCount(2 + 3)))
queue.Front()
Expect(queue.ByteLen()).To(Equal(protocol.ByteCount(2 + 3)))
length := protocol.ByteCount(len(prioFrame1.Data) + len(frame1.Data))
Expect(queue.ByteLen()).To(Equal(length))
queue.front()
Expect(queue.ByteLen()).To(Equal(length))
})
})
Context("Popping", func() {
It("returns nil when popping an empty queue", func() {
Expect(queue.Pop()).To(BeNil())
Expect(queue.Pop(1000)).To(BeNil())
})
It("deletes elements once they are popped", func() {
queue.Push(frame1, false)
Expect(queue.Pop()).To(Equal(frame1))
Expect(queue.Pop()).To(BeNil())
Expect(queue.Pop(1000)).To(Equal(frame1))
Expect(queue.Pop(1000)).To(BeNil())
})
It("returns normal frames if no prio frames are available", func() {
queue.Push(frame1, false)
queue.Push(frame2, false)
Expect(queue.Pop()).To(Equal(frame1))
Expect(queue.Pop()).To(Equal(frame2))
Expect(queue.Pop(1000)).To(Equal(frame1))
Expect(queue.Pop(1000)).To(Equal(frame2))
})
It("returns prio frames first", func() {
@@ -127,22 +124,96 @@ var _ = Describe("streamFrameQueue", func() {
queue.Push(frame1, false)
queue.Push(frame2, false)
queue.Push(prioFrame2, true)
Expect(queue.Pop()).To(Equal(prioFrame1))
Expect(queue.Pop()).To(Equal(prioFrame2))
Expect(queue.Pop()).To(Equal(frame1))
frame := queue.Pop(1000)
Expect(frame).To(Equal(prioFrame1))
frame = queue.Pop(1000)
Expect(frame).To(Equal(prioFrame2))
frame = queue.Pop(1000)
Expect(frame).To(Equal(frame1))
})
Context("splitting of frames", func() {
It("splits off nothing", func() {
f := &frames.StreamFrame{
StreamID: 1,
Data: []byte("bar"),
Offset: 3,
}
Expect(queue.maybeSplitOffFrame(f, 1000)).To(BeNil())
Expect(f.Offset).To(Equal(protocol.ByteCount(3)))
})
It("splits off initial frame", func() {
f := &frames.StreamFrame{
StreamID: 1,
Data: []byte("foobar"),
Offset: 3,
FinBit: true,
}
minLength, _ := f.MinLength()
previous := queue.maybeSplitOffFrame(f, minLength-1+3)
Expect(previous).ToNot(BeNil())
Expect(previous.StreamID).To(Equal(protocol.StreamID(1)))
Expect(previous.Data).To(Equal([]byte("foo")))
Expect(previous.Offset).To(Equal(protocol.ByteCount(3)))
Expect(previous.FinBit).To(BeFalse())
Expect(f.StreamID).To(Equal(protocol.StreamID(1)))
Expect(f.Data).To(Equal([]byte("bar")))
Expect(f.Offset).To(Equal(protocol.ByteCount(6)))
Expect(f.FinBit).To(BeTrue())
})
It("splits a frame", func() {
queue.Push(frame1, false)
origlen := len(frame1.Data)
frame := queue.Pop(6)
minLength, _ := frame.MinLength()
Expect(int(minLength) - 1 + len(frame.Data)).To(Equal(6))
Expect(queue.frames[0].Data).To(HaveLen(origlen - len(frame.Data)))
Expect(queue.frames[0].Offset).To(Equal(protocol.ByteCount(len(frame.Data))))
})
It("only removes a frame from the queue after return all split parts", func() {
queue.Push(frame1, false)
Expect(queue.Len()).To(Equal(1))
frame := queue.Pop(6)
Expect(frame).ToNot(BeNil())
Expect(queue.Len()).To(Equal(1))
frame = queue.Pop(100)
Expect(frame).ToNot(BeNil())
Expect(queue.Len()).To(BeZero())
})
It("gets the whole data of a frame, when it was split", func() {
length := len(frame1.Data)
origdata := make([]byte, length)
copy(origdata, frame1.Data)
queue.Push(frame1, false)
frame := queue.Pop(6)
nextframe := queue.Pop(1000)
Expect(len(frame.Data) + len(nextframe.Data)).To(Equal(length))
data := make([]byte, length)
copy(data, frame.Data)
copy(data[len(frame.Data):], nextframe.Data)
Expect(data).To(Equal(origdata))
})
})
})
Context("Front", func() {
It("returns nil for an empty queue", func() {
Expect(queue.Front()).To(BeNil())
Expect(queue.front()).To(BeNil())
})
It("returns normal frames if no prio frames are available", func() {
queue.Push(frame1, false)
queue.Push(frame2, false)
Expect(queue.Front()).To(Equal(frame1))
Expect(queue.Front()).To(Equal(frame1))
frame, isPrioFrame := queue.front()
Expect(isPrioFrame).To(BeFalse())
Expect(frame).To(Equal(frame1))
frame, isPrioFrame = queue.front()
Expect(isPrioFrame).To(BeFalse())
Expect(frame).To(Equal(frame1))
})
It("returns prio frames first", func() {
@@ -150,7 +221,9 @@ var _ = Describe("streamFrameQueue", func() {
queue.Push(frame1, false)
queue.Push(frame2, false)
queue.Push(prioFrame2, true)
Expect(queue.Front()).To(Equal(prioFrame1))
frame, isPrioFrame := queue.front()
Expect(isPrioFrame).To(BeTrue())
Expect(frame).To(Equal(prioFrame1))
})
})
})