Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

interp: make read cancellable via Run's ctx #857

Closed
wants to merge 8 commits into from
+297 −6
Closed

interp: make read cancellable via Run's ctx #857

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8b93eb0
interp: make `read` cancellable via Run's ctx
theclapp May 5, 2022
8ac39ce
More on CancelableReader
theclapp May 6, 2022
dc3962f
wip
theclapp May 7, 2022
cccd7d0
wip again
theclapp May 9, 2022
58ed9e7
wip
theclapp May 10, 2022
5b383dc
wip
theclapp May 16, 2022
7d25229
wip
theclapp May 18, 2022
c9a0d60
wip
theclapp Jul 1, 2022
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
Prev Previous commit
wip
@theclapp
theclapp committed Jan 7, 2023
commit c9a0d60048d098c43690126d71ee09c52c83d467
23 changes: 4 additions & 19 deletions interp/builtin.go
View file
Original file line number Diff line number Diff line change
@@ -10,6 +10,7 @@ import (
"errors"
"fmt"
"io"
"log"
"os"
"path/filepath"
"strconv"
@@ -925,26 +926,10 @@ func (r *Runner) readLine(raw bool) ([]byte, error) {
return nil, errors.New("interp: can't read, there's no stdin")
}

// log.Printf("readLine")
log.Printf("readLine")
stdin := r.stdin
if eofWriter, ok := stdin.(*EofWriter); ok {
// log.Printf("readLine starting NewEofReader")
eofReader, err := eofWriter.NewReader(r.ectx)
if err != nil {
return nil, err
}
stdin = eofReader
defer func() {
// log.Printf("readLine: eofWriter.EOF()")
eofWriter.CloseReader()
}()

// go func() {
// log.Printf("readLine cancel goroutine sleeping 5s")
// time.Sleep(5 * time.Second)
// log.Printf("readLine cancelling the EofReader")
// cr.Cancel()
// }()
stdin = eofWriter.R
}

var line []byte
@@ -953,7 +938,7 @@ func (r *Runner) readLine(raw bool) ([]byte, error) {
for {
var buf [1]byte
n, err := stdin.Read(buf[:])
// log.Printf("readline read %q, %d, %v", buf[:n], n, err)
log.Printf("readline read %q, %d, %v", buf[:n], n, err)
if n > 0 {
b := buf[0]
switch {
13 changes: 5 additions & 8 deletions interp/handler.go
View file
Original file line number Diff line number Diff line change
@@ -100,15 +100,13 @@ func DefaultExecHandler(killTimeout time.Duration) ExecHandlerFunc {
}

stdin := hc.Stdin
var eofReader io.ReadCloser
eofWriter, ok := stdin.(*EofWriter)
if ok {
eofReader, err = eofWriter.NewReader(ctx)
log.Printf("DefaultExecHandler: %s: eofReader: %p", path, eofWriter.R)
stdin, err = eofWriter.GetReader()
if err != nil {
return err
}
log.Printf("DefaultExecHandler: %s: eofReader: %p", path, eofReader)
stdin = eofReader
}

cmd := exec.Cmd{
@@ -153,10 +151,9 @@ func DefaultExecHandler(killTimeout time.Duration) ExecHandlerFunc {
// log.Printf("eofWriter.EOF error: %v", eofErr)
// }
}
if eofWriter != nil {
log.Printf("interp/handler: EofWriter.CloseReader(), %p", eofReader)
eofWriter.CloseReader()
}
// if eofWriter != nil {
// eofWriter.CloseReader()
// }

switch x := err.(type) {
case *exec.ExitError:
Loading