Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 18 additions & 27 deletions transport/pipe/impl.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package pipe
import (
"errors"
"io"
"runtime"
"sync"
"time"

Expand Down Expand Up @@ -136,11 +135,10 @@ func (p *pipe) writeMultiBufferInternal(mb buf.MultiBuffer) error {

if p.data == nil {
p.data = mb
return nil
} else {
p.data, _ = buf.MergeMulti(p.data, mb)
}

p.data, _ = buf.MergeMulti(p.data, mb)
return errSlowDown
return nil
}

func (p *pipe) WriteMultiBuffer(mb buf.MultiBuffer) error {
Expand All @@ -155,30 +153,23 @@ func (p *pipe) WriteMultiBuffer(mb buf.MultiBuffer) error {
return nil
}

if err == errSlowDown {
p.readSignal.Signal()

// Yield current goroutine. Hopefully the reading counterpart can pick up the payload.
runtime.Gosched()
return nil
}

if err == errBufferFull && p.option.discardOverflow {
buf.ReleaseMulti(mb)
return nil
if err == errBufferFull {
if p.option.discardOverflow {
buf.ReleaseMulti(mb)
return nil
}
select {
case <-p.writeSignal.Wait():
continue
case <-p.done.Wait():
buf.ReleaseMulti(mb)
return io.ErrClosedPipe
}
}

if err != errBufferFull {
buf.ReleaseMulti(mb)
p.readSignal.Signal()
return err
}

select {
case <-p.writeSignal.Wait():
case <-p.done.Wait():
return io.ErrClosedPipe
}
buf.ReleaseMulti(mb)
p.readSignal.Signal()
return err
}
}

Expand Down
Loading