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

fix a race condition of openStreamsCount in session

Browse Source
This commit is contained in:
Lucas Clemente
2016-06-05 12:17:10 +02:00
parent d2c1f0c71a
commit 981b465287
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
session.go
View File

@@ -602,17 +602,17 @@ func (s *Session) GetOrOpenStream(id protocol.StreamID) (utils.Stream, error) {
// The streamsMutex is locked by OpenStream or GetOrOpenStream before calling this function. // The streamsMutex is locked by OpenStream or GetOrOpenStream before calling this function.
func (s *Session) newStreamImpl(id protocol.StreamID) (*stream, error) { func (s *Session) newStreamImpl(id protocol.StreamID) (*stream, error) {
maxAllowedStreams := uint32(protocol.MaxStreamsMultiplier * float32(s.connectionParametersManager.GetMaxStreamsPerConnection())) maxAllowedStreams := uint32(protocol.MaxStreamsMultiplier * float32(s.connectionParametersManager.GetMaxStreamsPerConnection()))
if s.openStreamsCount >= maxAllowedStreams { if atomic.LoadUint32(&s.openStreamsCount) >= maxAllowedStreams {
return nil, qerr.TooManyOpenStreams return nil, qerr.TooManyOpenStreams
} }
if _, ok := s.streams[id]; ok {
return nil, fmt.Errorf("Session: stream with ID %d already exists", id)
}
stream, err := newStream(s, s.connectionParametersManager, s.flowController, id) stream, err := newStream(s, s.connectionParametersManager, s.flowController, id)
if err != nil { if err != nil {
return nil, err return nil, err
} }
if s.streams[id] != nil { atomic.AddUint32(&s.openStreamsCount, 1)
return nil, fmt.Errorf("Session: stream with ID %d already exists", id)
}
s.openStreamsCount++
s.streams[id] = stream s.streams[id] = stream
return stream, nil return stream, nil
} }
@@ -633,7 +633,7 @@ func (s *Session) garbageCollectStreams() {
s.windowUpdateManager.RemoveStream(k) s.windowUpdateManager.RemoveStream(k)
} }
if v.finished() { if v.finished() {
s.openStreamsCount-- atomic.AddUint32(&s.openStreamsCount, ^uint32(0)) // decrement
s.streams[k] = nil s.streams[k] = nil
} }
} }