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

simplify onStreamCompleted in the receiveStream

Browse source
This commit is contained in:
Marten Seemann 2019-11-09 11:34:33 +07:00
parent dc66c8a4e4
commit 529e14d0cc
1 changed files with 7 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

22
receive_stream.go
View file

@ -84,7 +84,7 @@ func (s *receiveStream) Read(p []byte) (int, error) {
s.mutex.Unlock()
if completed {
s.streamCompleted()
s.sender.onStreamCompleted(s.streamID)
}
return n, err
}
@ -201,7 +201,8 @@ func (s *receiveStream) CancelRead(errorCode protocol.ApplicationErrorCode) {
s.mutex.Unlock()
if completed {
s.streamCompleted()
s.flowController.Abandon()
s.sender.onStreamCompleted(s.streamID)
}
}
@ -226,7 +227,8 @@ func (s *receiveStream) handleStreamFrame(frame *wire.StreamFrame) error {
s.mutex.Unlock()
if completed {
s.streamCompleted()
s.flowController.Abandon()
s.sender.onStreamCompleted(s.streamID)
}
return err
}
@ -257,7 +259,8 @@ func (s *receiveStream) handleResetStreamFrame(frame *wire.ResetStreamFrame) err
s.mutex.Unlock()
if completed {
s.streamCompleted()
s.flowController.Abandon()
s.sender.onStreamCompleted(s.streamID)
}
return err
}
@ -312,17 +315,6 @@ func (s *receiveStream) getWindowUpdate() protocol.ByteCount {
return s.flowController.GetWindowUpdate()
}
func (s *receiveStream) streamCompleted() {
s.mutex.Lock()
finRead := s.finRead
s.mutex.Unlock()
if !finRead {
s.flowController.Abandon()
}
s.sender.onStreamCompleted(s.streamID)
}
// signalRead performs a non-blocking send on the readChan
func (s *receiveStream) signalRead() {
select {