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

fix deadlock when sending stream data

Browse source
This commit is contained in:
Marten Seemann 2018-12-18 16:10:17 +06:30
parent dadb6d395c
commit 8761cee0ef
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
send_stream.go
View file

@ -96,10 +96,10 @@ func (s *sendStream) Write(p []byte) (int, error) {
} }
s.dataForWriting = p s.dataForWriting = p
s.sender.onHasStreamData(s.streamID)
var bytesWritten int var bytesWritten int
var err error var err error
var notifiedSender bool
for { for {
bytesWritten = len(p) - len(s.dataForWriting) bytesWritten = len(p) - len(s.dataForWriting)
if !s.deadline.IsZero() && !time.Now().Before(s.deadline) { if !s.deadline.IsZero() && !time.Now().Before(s.deadline) {
@ -112,6 +112,10 @@ func (s *sendStream) Write(p []byte) (int, error) {
} }
s.mutex.Unlock() s.mutex.Unlock()
if !notifiedSender {
s.sender.onHasStreamData(s.streamID) // must be called without holding the mutex
notifiedSender = true
}
if s.deadline.IsZero() { if s.deadline.IsZero() {
<-s.writeChan <-s.writeChan
} else { } else {