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

refactor frame packing to logic to not access the streams map (#4596)

Browse Source 
* avoid accessing the streams map when packing stream data

* avoid accessing the streams map when packing flow control frames

* remove streamGetter interface
This commit is contained in:
Marten Seemann
2024-07-28 12:32:54 -07:00
committed by GitHub
parent fc79a77ffe
commit 42f04d4e02
20 changed files with 224 additions and 390 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
window_update_queue_test.go
View File

@@ -12,39 +12,36 @@ import (
var _ = Describe("Window Update Queue", func() {
var (
q *windowUpdateQueue
streamGetter *MockStreamGetter
connFC *mocks.MockConnectionFlowController
queuedFrames []wire.Frame
)
BeforeEach(func() {
streamGetter = NewMockStreamGetter(mockCtrl)
connFC = mocks.NewMockConnectionFlowController(mockCtrl)
queuedFrames = queuedFrames[:0]
q = newWindowUpdateQueue(streamGetter, connFC, func(f wire.Frame) {
q = newWindowUpdateQueue(connFC, func(f wire.Frame) {
queuedFrames = append(queuedFrames, f)
})
})
It("adds stream offsets and gets MAX_STREAM_DATA frames", func() {
connFC.EXPECT().GetWindowUpdate().Return(protocol.ByteCount(0)).AnyTimes()
stream1 := NewMockStreamI(mockCtrl)
stream1.EXPECT().getWindowUpdate().Return(protocol.ByteCount(10))
stream3 := NewMockStreamI(mockCtrl)
stream3.EXPECT().getWindowUpdate().Return(protocol.ByteCount(30))
streamGetter.EXPECT().GetOrOpenReceiveStream(protocol.StreamID(3)).Return(stream3, nil)
streamGetter.EXPECT().GetOrOpenReceiveStream(protocol.StreamID(1)).Return(stream1, nil)
q.AddStream(3)
q.AddStream(1)
q.AddStream(3, stream3)
q.AddStream(1, stream1)
q.QueueAll()
Expect(queuedFrames).To(ContainElement(&wire.MaxStreamDataFrame{StreamID: 1, MaximumStreamData: 10}))
Expect(queuedFrames).To(ContainElement(&wire.MaxStreamDataFrame{StreamID: 3, MaximumStreamData: 30}))
})
It("deletes the entry after getting the MAX_STREAM_DATA frame", func() {
connFC.EXPECT().GetWindowUpdate().Return(protocol.ByteCount(0)).AnyTimes()
stream10 := NewMockStreamI(mockCtrl)
stream10.EXPECT().getWindowUpdate().Return(protocol.ByteCount(100))
streamGetter.EXPECT().GetOrOpenReceiveStream(protocol.StreamID(10)).Return(stream10, nil)
q.AddStream(10)
q.AddStream(10, stream10)
q.QueueAll()
Expect(queuedFrames).To(HaveLen(1))
q.QueueAll()
@@ -52,36 +49,37 @@ var _ = Describe("Window Update Queue", func() {
})
It("doesn't queue a MAX_STREAM_DATA for a closed stream", func() {
q.AddStream(12)
streamGetter.EXPECT().GetOrOpenReceiveStream(protocol.StreamID(12)).Return(nil, nil)
connFC.EXPECT().GetWindowUpdate().Return(protocol.ByteCount(0)).AnyTimes()
stream12 := NewMockStreamI(mockCtrl)
q.AddStream(12, stream12)
q.RemoveStream(12)
q.QueueAll()
Expect(queuedFrames).To(BeEmpty())
})
It("removes closed streams from the queue", func() {
q.AddStream(12)
streamGetter.EXPECT().GetOrOpenReceiveStream(protocol.StreamID(12)).Return(nil, nil)
q.QueueAll()
Expect(queuedFrames).To(BeEmpty())
// don't EXPECT any further calls to GetOrOpenReceiveStream
connFC.EXPECT().GetWindowUpdate().Return(protocol.ByteCount(0)).AnyTimes()
stream12 := NewMockStreamI(mockCtrl)
q.AddStream(12, stream12)
q.RemoveStream(12)
q.QueueAll()
Expect(queuedFrames).To(BeEmpty())
})
It("doesn't queue a MAX_STREAM_DATA if the flow controller returns an offset of 0", func() {
connFC.EXPECT().GetWindowUpdate().Return(protocol.ByteCount(0))
stream5 := NewMockStreamI(mockCtrl)
stream5.EXPECT().getWindowUpdate().Return(protocol.ByteCount(0))
q.AddStream(5)
streamGetter.EXPECT().GetOrOpenReceiveStream(protocol.StreamID(5)).Return(stream5, nil)
q.AddStream(5, stream5)
q.QueueAll()
Expect(queuedFrames).To(BeEmpty())
})
It("removes streams for which the flow controller returns an offset of 0 from the queue", func() {
connFC.EXPECT().GetWindowUpdate().Return(protocol.ByteCount(0)).AnyTimes()
stream5 := NewMockStreamI(mockCtrl)
stream5.EXPECT().getWindowUpdate().Return(protocol.ByteCount(0))
q.AddStream(5)
streamGetter.EXPECT().GetOrOpenReceiveStream(protocol.StreamID(5)).Return(stream5, nil)
q.AddStream(5, stream5)
q.QueueAll()
Expect(queuedFrames).To(BeEmpty())
// don't EXPECT any further calls to GetOrOpenReveiveStream and to getWindowUpdate
@@ -91,22 +89,17 @@ var _ = Describe("Window Update Queue", func() {
It("queues MAX_DATA frames", func() {
connFC.EXPECT().GetWindowUpdate().Return(protocol.ByteCount(0x1337))
q.AddConnection()
q.QueueAll()
Expect(queuedFrames).To(Equal([]wire.Frame{
&wire.MaxDataFrame{MaximumData: 0x1337},
}))
Expect(queuedFrames).To(Equal([]wire.Frame{&wire.MaxDataFrame{MaximumData: 0x1337}}))
})
It("deduplicates", func() {
connFC.EXPECT().GetWindowUpdate().Return(protocol.ByteCount(0))
stream10 := NewMockStreamI(mockCtrl)
stream10.EXPECT().getWindowUpdate().Return(protocol.ByteCount(200))
streamGetter.EXPECT().GetOrOpenReceiveStream(protocol.StreamID(10)).Return(stream10, nil)
q.AddStream(10)
q.AddStream(10)
q.AddStream(10, stream10)
q.AddStream(10, stream10)
q.QueueAll()
Expect(queuedFrames).To(Equal([]wire.Frame{
&wire.MaxStreamDataFrame{StreamID: 10, MaximumStreamData: 200},
}))
Expect(queuedFrames).To(Equal([]wire.Frame{&wire.MaxStreamDataFrame{StreamID: 10, MaximumStreamData: 200}}))
})
})