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

handle the crypto stream separately

Browse source
This commit is contained in:
Marten Seemann 2017-10-21 11:43:57 +07:00
parent 9825ddb43a
commit 5ee7b205c6
7 changed files with 66 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

25
streams_map.go
View file

@ -59,13 +59,11 @@ func newStreamsMap(newStream newStreamLambda, pers protocol.Perspective) *stream
sm.openStreamOrErrCond.L = &sm.mutex
if pers == protocol.PerspectiveClient {
sm.nextStream = 1
sm.nextStream = 3
sm.nextStreamToAccept = 2
// TODO: find a better solution for opening the crypto stream
sm.maxOutgoingStreams = 1 // allow the crypto stream
} else {
sm.nextStream = 2
sm.nextStreamToAccept = 1
sm.nextStreamToAccept = 3
}
return &sm
@ -271,7 +269,7 @@ func (m *streamsMap) DeleteClosedStreams() error {
// RoundRobinIterate executes the streamLambda for every open stream, until the streamLambda returns false
// It uses a round-robin-like scheduling to ensure that every stream is considered fairly
// It prioritizes the crypto- and the header-stream (StreamIDs 1 and 3)
// It prioritizes the the header-stream (StreamID 3)
func (m *streamsMap) RoundRobinIterate(fn streamLambda) error {
m.mutex.Lock()
defer m.mutex.Unlock()
@ -279,19 +277,18 @@ func (m *streamsMap) RoundRobinIterate(fn streamLambda) error {
numStreams := len(m.streams)
startIndex := m.roundRobinIndex
for _, i := range []protocol.StreamID{1, 3} {
cont, err := m.iterateFunc(i, fn)
if err != nil && err != errMapAccess {
return err
}
if !cont {
return nil
}
// prioritize the header stream
cont, err := m.iterateFunc(3, fn)
if err != nil && err != errMapAccess {
return err
}
if !cont {
return nil
}
for i := 0; i < numStreams; i++ {
streamID := m.openStreams[(i+startIndex)%numStreams]
if streamID == 1 || streamID == 3 {
if streamID == 3 {
continue
}