github/smux
4
0
Fork 0
mirror of https://github.com/xtaci/smux.git synced 2024-04-21 10:51:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

make sure streamLock is non-blocking due to receiveBytes

Browse Source
This commit is contained in:
xtaci
2019-04-17 21:29:58 +08:00
parent 8a71918d00
commit 20e41dd6bd
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
session.go
+9 -11
View File
@@ -248,20 +248,18 @@ func (s *Session) recvLoop() {
}
s.streamLock.Unlock()
case cmdPSH:
var written int64
var err error
s.streamLock.Lock()
if stream, ok := s.streams[sid]; ok {
written, err = stream.receiveBytes(s.conn, int64(hdr.Length()))
atomic.AddInt32(&s.bucket, -int32(written))
stream.notifyReadEvent()
}
stream := s.streams[sid]
s.streamLock.Unlock()
// read data error
if err != nil {
s.Close()
return
if stream != nil {
written, err := stream.receiveBytes(s.conn, int64(hdr.Length()))
atomic.AddInt32(&s.bucket, -int32(written))
stream.notifyReadEvent()
if err != nil {
s.Close()
return
}
}
default:
s.Close()