mirrors/uquic
1
0
Fork 0
mirror of https://github.com/refraction-networking/uquic.git synced 2025-04-04 20:57:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

simplify variable types in the streams map

Browse source 
ints should be sufficient.
This commit is contained in:
Marten Seemann 2017-10-03 11:17:41 -07:00
parent 709eec55b5
commit 535bbf529a
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
streams_map.go
View file

@ -19,7 +19,7 @@ type streamsMap struct {
streams map[protocol.StreamID]*stream streams map[protocol.StreamID]*stream
// needed for round-robin scheduling // needed for round-robin scheduling
openStreams []protocol.StreamID openStreams []protocol.StreamID
roundRobinIndex uint32 roundRobinIndex int
nextStream protocol.StreamID // StreamID of the next Stream that will be returned by OpenStream() nextStream protocol.StreamID // StreamID of the next Stream that will be returned by OpenStream()
highestStreamOpenedByPeer protocol.StreamID highestStreamOpenedByPeer protocol.StreamID
@ -255,7 +255,7 @@ func (m *streamsMap) DeleteClosedStreams() error {
} }
if id != 0 { if id != 0 {
j++ j++
} else if uint32(j) < m.roundRobinIndex { } else if j < m.roundRobinIndex {
m.roundRobinIndex-- m.roundRobinIndex--
} }
} }
@ -271,7 +271,7 @@ func (m *streamsMap) RoundRobinIterate(fn streamLambda) error {
m.mutex.Lock() m.mutex.Lock()
defer m.mutex.Unlock() defer m.mutex.Unlock()
numStreams := uint32(len(m.streams)) numStreams := len(m.streams)
startIndex := m.roundRobinIndex startIndex := m.roundRobinIndex
for _, i := range []protocol.StreamID{1, 3} { for _, i := range []protocol.StreamID{1, 3} {
@ -284,7 +284,7 @@ func (m *streamsMap) RoundRobinIterate(fn streamLambda) error {
} }
} }
for i := uint32(0); i < numStreams; i++ { for i := 0; i < numStreams; i++ {
streamID := m.openStreams[(i+startIndex)%numStreams] streamID := m.openStreams[(i+startIndex)%numStreams]
if streamID == 1 || streamID == 3 { if streamID == 1 || streamID == 3 {
continue continue

8
streams_map_test.go
View file

@ -573,7 +573,7 @@ var _ = Describe("Streams Map", func() {
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
Expect(numIterations).To(Equal(5)) Expect(numIterations).To(Equal(5))
Expect(lambdaCalledForStream).To(Equal([]protocol.StreamID{7, 8, 4, 5, 6})) Expect(lambdaCalledForStream).To(Equal([]protocol.StreamID{7, 8, 4, 5, 6}))
Expect(m.roundRobinIndex).To(Equal(uint32(3))) Expect(m.roundRobinIndex).To(BeEquivalentTo(3))
}) })
It("picks up at the index+1 where it last stopped", func() { It("picks up at the index+1 where it last stopped", func() {
@ -589,7 +589,7 @@ var _ = Describe("Streams Map", func() {
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
Expect(numIterations).To(Equal(2)) Expect(numIterations).To(Equal(2))
Expect(lambdaCalledForStream).To(Equal([]protocol.StreamID{4, 5})) Expect(lambdaCalledForStream).To(Equal([]protocol.StreamID{4, 5}))
Expect(m.roundRobinIndex).To(Equal(uint32(2))) Expect(m.roundRobinIndex).To(BeEquivalentTo(2))
numIterations = 0 numIterations = 0
lambdaCalledForStream = lambdaCalledForStream[:0] lambdaCalledForStream = lambdaCalledForStream[:0]
fn2 := func(str *stream) (bool, error) { fn2 := func(str *stream) (bool, error) {
@ -615,7 +615,7 @@ var _ = Describe("Streams Map", func() {
It("adjusts when deleting an element in front", func() { It("adjusts when deleting an element in front", func() {
m.roundRobinIndex = 3 // stream 7 m.roundRobinIndex = 3 // stream 7
deleteStream(5) deleteStream(5)
Expect(m.roundRobinIndex).To(Equal(uint32(2))) Expect(m.roundRobinIndex).To(BeEquivalentTo(2))
}) })
It("doesn't adjust when deleting an element at the back", func() { It("doesn't adjust when deleting an element at the back", func() {
@ -627,7 +627,7 @@ var _ = Describe("Streams Map", func() {
It("doesn't adjust when deleting the element it is pointing to", func() { It("doesn't adjust when deleting the element it is pointing to", func() {
m.roundRobinIndex = 3 // stream 7 m.roundRobinIndex = 3 // stream 7
deleteStream(7) deleteStream(7)
Expect(m.roundRobinIndex).To(Equal(uint32(3))) Expect(m.roundRobinIndex).To(BeEquivalentTo(3))
}) })
It("adjusts when deleting multiple elements", func() { It("adjusts when deleting multiple elements", func() {