mirror of https://github.com/chzyer/readline.git
fix deadlock in cancelable stdin (#89)
* fix deadlock in cancelable stdin * fix notify back * [cancelable stdin] fix c.notify
This commit is contained in:
parent
94eaec69a7
commit
25c2772d5f
21
std.go
21
std.go
|
@ -4,6 +4,7 @@ import (
|
||||||
"io"
|
"io"
|
||||||
"os"
|
"os"
|
||||||
"sync"
|
"sync"
|
||||||
|
"sync/atomic"
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
|
@ -69,6 +70,7 @@ type CancelableStdin struct {
|
||||||
r io.Reader
|
r io.Reader
|
||||||
mutex sync.Mutex
|
mutex sync.Mutex
|
||||||
stop chan struct{}
|
stop chan struct{}
|
||||||
|
closed int32
|
||||||
notify chan struct{}
|
notify chan struct{}
|
||||||
data []byte
|
data []byte
|
||||||
read int
|
read int
|
||||||
|
@ -91,7 +93,11 @@ loop:
|
||||||
select {
|
select {
|
||||||
case <-c.notify:
|
case <-c.notify:
|
||||||
c.read, c.err = c.r.Read(c.data)
|
c.read, c.err = c.r.Read(c.data)
|
||||||
c.notify <- struct{}{}
|
select {
|
||||||
|
case c.notify <- struct{}{}:
|
||||||
|
case <-c.stop:
|
||||||
|
break loop
|
||||||
|
}
|
||||||
case <-c.stop:
|
case <-c.stop:
|
||||||
break loop
|
break loop
|
||||||
}
|
}
|
||||||
|
@ -101,9 +107,16 @@ loop:
|
||||||
func (c *CancelableStdin) Read(b []byte) (n int, err error) {
|
func (c *CancelableStdin) Read(b []byte) (n int, err error) {
|
||||||
c.mutex.Lock()
|
c.mutex.Lock()
|
||||||
defer c.mutex.Unlock()
|
defer c.mutex.Unlock()
|
||||||
|
if atomic.LoadInt32(&c.closed) == 1 {
|
||||||
|
return 0, io.EOF
|
||||||
|
}
|
||||||
|
|
||||||
c.data = b
|
c.data = b
|
||||||
c.notify <- struct{}{}
|
select {
|
||||||
|
case c.notify <- struct{}{}:
|
||||||
|
case <-c.stop:
|
||||||
|
return 0, io.EOF
|
||||||
|
}
|
||||||
select {
|
select {
|
||||||
case <-c.notify:
|
case <-c.notify:
|
||||||
return c.read, c.err
|
return c.read, c.err
|
||||||
|
@ -113,6 +126,8 @@ func (c *CancelableStdin) Read(b []byte) (n int, err error) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *CancelableStdin) Close() error {
|
func (c *CancelableStdin) Close() error {
|
||||||
close(c.stop)
|
if atomic.CompareAndSwapInt32(&c.closed, 0, 1) {
|
||||||
|
close(c.stop)
|
||||||
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue