mirror of https://github.com/chzyer/readline.git
Fix ioloop groutine leaks bug. (#136)
* Fix ioloop groutine leaks bug. * fix func (o *Operation) ioloop() L:125 hangs
This commit is contained in:
parent
40d6036c33
commit
f6d7a1f6fb
|
@ -0,0 +1 @@
|
|||
.vscode/*
|
|
@ -72,7 +72,7 @@ func NewOperation(t *Terminal, cfg *Config) *Operation {
|
|||
t: t,
|
||||
buf: NewRuneBuffer(t, cfg.Prompt, cfg, width),
|
||||
outchan: make(chan []rune),
|
||||
errchan: make(chan error),
|
||||
errchan: make(chan error, 1),
|
||||
}
|
||||
op.w = op.buf.w
|
||||
op.SetConfig(cfg)
|
||||
|
|
|
@ -54,7 +54,7 @@ type Config struct {
|
|||
|
||||
FuncGetWidth func() int
|
||||
|
||||
Stdin io.Reader
|
||||
Stdin io.ReadCloser
|
||||
StdinWriter io.Writer
|
||||
Stdout io.Writer
|
||||
Stderr io.Writer
|
||||
|
@ -274,6 +274,7 @@ func (i *Instance) Close() error {
|
|||
if err := i.Terminal.Close(); err != nil {
|
||||
return err
|
||||
}
|
||||
i.Config.Stdin.Close()
|
||||
i.Operation.Close()
|
||||
return nil
|
||||
}
|
||||
|
|
|
@ -189,11 +189,12 @@ loop:
|
|||
}
|
||||
}
|
||||
|
||||
func (r *RemoteSvr) Close() {
|
||||
func (r *RemoteSvr) Close() error {
|
||||
if atomic.CompareAndSwapInt32(&r.closed, 0, 1) {
|
||||
close(r.stopChan)
|
||||
r.conn.Close()
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (r *RemoteSvr) readLoop(buf *bufio.Reader) {
|
||||
|
|
21
std.go
21
std.go
|
@ -137,14 +137,13 @@ func (c *CancelableStdin) Close() error {
|
|||
type FillableStdin struct {
|
||||
sync.Mutex
|
||||
stdin io.Reader
|
||||
stdinBuffer io.Reader
|
||||
stdinBuffer io.ReadCloser
|
||||
buf []byte
|
||||
bufErr error
|
||||
}
|
||||
|
||||
// NewFillableStdin gives you FillableStdin
|
||||
func NewFillableStdin(stdin io.Reader) (io.Reader, io.Writer) {
|
||||
|
||||
func NewFillableStdin(stdin io.Reader) (io.ReadCloser, io.Writer) {
|
||||
r, w := io.Pipe()
|
||||
s := &FillableStdin{
|
||||
stdinBuffer: r,
|
||||
|
@ -152,7 +151,6 @@ func NewFillableStdin(stdin io.Reader) (io.Reader, io.Writer) {
|
|||
}
|
||||
s.ioloop()
|
||||
return s, w
|
||||
|
||||
}
|
||||
|
||||
func (s *FillableStdin) ioloop() {
|
||||
|
@ -161,6 +159,11 @@ func (s *FillableStdin) ioloop() {
|
|||
bufR := make([]byte, 100)
|
||||
var n int
|
||||
n, s.bufErr = s.stdinBuffer.Read(bufR)
|
||||
if s.bufErr != nil {
|
||||
if s.bufErr == io.ErrClosedPipe {
|
||||
break
|
||||
}
|
||||
}
|
||||
s.Lock()
|
||||
s.buf = append(s.buf, bufR[:n]...)
|
||||
s.Unlock()
|
||||
|
@ -184,7 +187,11 @@ func (s *FillableStdin) Read(p []byte) (n int, err error) {
|
|||
return n, cerr
|
||||
}
|
||||
s.Unlock()
|
||||
|
||||
return s.stdin.Read(p)
|
||||
|
||||
n, err = s.stdin.Read(p)
|
||||
return n, err
|
||||
}
|
||||
|
||||
func (s *FillableStdin) Close() error {
|
||||
s.stdinBuffer.Close()
|
||||
return nil
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue