MirrorMirror
/
riju
mirror of https://github.com/radian-software/riju.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix some deadlocks

This commit is contained in:
Radon Rosborough 2022-12-27 18:31:48 -07:00
parent 1477281cff
commit 56c3151069
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
agent/process.go
View File

@ -28,9 +28,12 @@ type managedProcess struct {
func NewManagedProcess(name string, argv []string, attr *os.ProcAttr) (*managedProcess, error) { func NewManagedProcess(name string, argv []string, attr *os.ProcAttr) (*managedProcess, error) {
mp := &managedProcess{ mp := &managedProcess{
internalExitChan: make(chan struct{}, 16),
StdinChan: make(chan []byte, 16), StdinChan: make(chan []byte, 16),
StdoutChan: make(chan []byte, 16), StdoutChan: make(chan []byte, 16),
StderrChan: make(chan []byte, 16), StderrChan: make(chan []byte, 16),
ExitChan: make(chan *os.ProcessState, 16),
CloseChan: make(chan struct{}, 16), CloseChan: make(chan struct{}, 16),
} }
done := false done := false
@ -77,9 +80,9 @@ func NewManagedProcess(name string, argv []string, attr *os.ProcAttr) (*managedP
func (mp *managedProcess) handleInput(ch chan []byte, f *os.File, name string) { func (mp *managedProcess) handleInput(ch chan []byte, f *os.File, name string) {
for data := range ch { for data := range ch {
nw, err := f.Write(data) _, err := f.Write(data)
if err != nil { if err != nil {
logWarnf("writing to %s: got error after %d of %d byte(s): %w", name, nw, len(data), err) // Likely stdin closed by subprocess, this is normal
return return
} }
} }
@ -90,7 +93,8 @@ func (mp *managedProcess) handleOutput(ch chan []byte, f *os.File, name string)
buf := make([]byte, 1024) buf := make([]byte, 1024)
nr, err := f.Read(buf) nr, err := f.Read(buf)
if err != nil { if err != nil {
logWarnf("reading from %s: got error after %d byte(s): %w", name, nr, err) // Likely stdout/stderr closed by subprocess,
// this is normal
return return
} }
if nr == 0 { if nr == 0 {