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

remove the flow control manager

Browse source
This commit is contained in:
Marten Seemann 2017-10-17 11:14:58 +07:00
parent 6dc453caa3
commit 268c3859fc
25 changed files with 1710 additions and 1942 deletions
Download patch file Download diff file Expand all files Collapse all files

44
streams_map.go
View file

@ -15,7 +15,7 @@ type streamsMap struct {
perspective protocol.Perspective
streams map[protocol.StreamID]*stream
streams map[protocol.StreamID]streamI
// needed for round-robin scheduling
openStreams []protocol.StreamID
roundRobinIndex int
@ -28,8 +28,7 @@ type streamsMap struct {
closeErr error
nextStreamToAccept protocol.StreamID
newStream newStreamLambda
removeStreamCallback removeStreamCallback
newStream newStreamLambda
numOutgoingStreams uint32
numIncomingStreams uint32
@ -37,13 +36,12 @@ type streamsMap struct {
maxOutgoingStreams uint32
}
type streamLambda func(*stream) (bool, error)
type removeStreamCallback func(protocol.StreamID)
type newStreamLambda func(protocol.StreamID) *stream
type streamLambda func(streamI) (bool, error)
type newStreamLambda func(protocol.StreamID) streamI
var errMapAccess = errors.New("streamsMap: Error accessing the streams map")
func newStreamsMap(newStream newStreamLambda, removeStreamCallback removeStreamCallback, pers protocol.Perspective) *streamsMap {
func newStreamsMap(newStream newStreamLambda, pers protocol.Perspective) *streamsMap {
// add some tolerance to the maximum incoming streams value
maxStreams := uint32(protocol.MaxIncomingStreams)
maxIncomingStreams := utils.MaxUint32(
@ -51,12 +49,11 @@ func newStreamsMap(newStream newStreamLambda, removeStreamCallback removeStreamC
uint32(float64(maxStreams)*float64(protocol.MaxStreamsMultiplier)),
)
sm := streamsMap{
perspective: pers,
streams: make(map[protocol.StreamID]*stream),
openStreams: make([]protocol.StreamID, 0),
newStream: newStream,
removeStreamCallback: removeStreamCallback,
maxIncomingStreams: maxIncomingStreams,
perspective: pers,
streams: make(map[protocol.StreamID]streamI),
openStreams: make([]protocol.StreamID, 0),
newStream: newStream,
maxIncomingStreams: maxIncomingStreams,
}
sm.nextStreamOrErrCond.L = &sm.mutex
sm.openStreamOrErrCond.L = &sm.mutex
@ -76,7 +73,7 @@ func newStreamsMap(newStream newStreamLambda, removeStreamCallback removeStreamC
// GetOrOpenStream either returns an existing stream, a newly opened stream, or nil if a stream with the provided ID is already closed.
// Newly opened streams should only originate from the client. To open a stream from the server, OpenStream should be used.
func (m *streamsMap) GetOrOpenStream(id protocol.StreamID) (*stream, error) {
func (m *streamsMap) GetOrOpenStream(id protocol.StreamID) (streamI, error) {
m.mutex.RLock()
s, ok := m.streams[id]
m.mutex.RUnlock()
@ -134,7 +131,7 @@ func (m *streamsMap) GetOrOpenStream(id protocol.StreamID) (*stream, error) {
return m.streams[id], nil
}
func (m *streamsMap) openRemoteStream(id protocol.StreamID) (*stream, error) {
func (m *streamsMap) openRemoteStream(id protocol.StreamID) (streamI, error) {
if m.numIncomingStreams >= m.maxIncomingStreams {
return nil, qerr.TooManyOpenStreams
}
@ -157,7 +154,7 @@ func (m *streamsMap) openRemoteStream(id protocol.StreamID) (*stream, error) {
return s, nil
}
func (m *streamsMap) openStreamImpl() (*stream, error) {
func (m *streamsMap) openStreamImpl() (streamI, error) {
id := m.nextStream
if m.numOutgoingStreams >= m.maxOutgoingStreams {
return nil, qerr.TooManyOpenStreams
@ -176,7 +173,7 @@ func (m *streamsMap) openStreamImpl() (*stream, error) {
}
// OpenStream opens the next available stream
func (m *streamsMap) OpenStream() (*stream, error) {
func (m *streamsMap) OpenStream() (streamI, error) {
m.mutex.Lock()
defer m.mutex.Unlock()
@ -186,7 +183,7 @@ func (m *streamsMap) OpenStream() (*stream, error) {
return m.openStreamImpl()
}
func (m *streamsMap) OpenStreamSync() (*stream, error) {
func (m *streamsMap) OpenStreamSync() (streamI, error) {
m.mutex.Lock()
defer m.mutex.Unlock()
@ -207,10 +204,10 @@ func (m *streamsMap) OpenStreamSync() (*stream, error) {
// AcceptStream returns the next stream opened by the peer
// it blocks until a new stream is opened
func (m *streamsMap) AcceptStream() (*stream, error) {
func (m *streamsMap) AcceptStream() (streamI, error) {
m.mutex.Lock()
defer m.mutex.Unlock()
var str *stream
var str streamI
for {
var ok bool
if m.closeErr != nil {
@ -237,10 +234,9 @@ func (m *streamsMap) DeleteClosedStreams() error {
if !ok {
return errMapAccess
}
if !str.finished() {
if !str.Finished() {
continue
}
m.removeStreamCallback(streamID)
numDeletedStreams++
m.openStreams[i] = 0
if streamID%2 == 0 {
@ -312,7 +308,7 @@ func (m *streamsMap) RoundRobinIterate(fn streamLambda) error {
}
// Range executes a callback for all streams, in pseudo-random order
func (m *streamsMap) Range(cb func(s *stream)) {
func (m *streamsMap) Range(cb func(s streamI)) {
m.mutex.RLock()
defer m.mutex.RUnlock()
@ -331,7 +327,7 @@ func (m *streamsMap) iterateFunc(streamID protocol.StreamID, fn streamLambda) (b
return fn(str)
}
func (m *streamsMap) putStream(s *stream) error {
func (m *streamsMap) putStream(s streamI) error {
id := s.StreamID()
if _, ok := m.streams[id]; ok {
return fmt.Errorf("a stream with ID %d already exists", id)