go-sylixos/elvish
3
0
Fork 0
mirror of https://github.com/go-sylixos/elvish.git synced 2024-12-13 18:07:51 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

edit: fix async_reader

Browse Source
This commit is contained in:
Qi Xiao 2016-02-03 13:14:17 +01:00
parent 38e0df7b58
commit ff78be04db
1 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
edit/async_reader.go
View File

@ -71,24 +71,18 @@ func (ar *AsyncReader) Start() {
ar.ackCtrl <- true
return
} else {
ReadRune:
for {
r, _, err := ar.bufrd.ReadRune()
switch err {
case nil:
// Deadlock when consumer goroutine is in .Quit!
ar.ch <- r
case io.EOF:
return
default:
// BUG(xiaq): AsyncReader relies on the undocumented fact
// that (*os.File).Read returns an *os.File.PathError
e := err.(*os.PathError).Err
if e == syscall.EWOULDBLOCK || e == syscall.EAGAIN {
break ReadRune
} else {
panic(err)
}
r, _, err := ar.bufrd.ReadRune()
switch err {
case nil:
ar.ch <- r
case io.EOF:
return
default:
// BUG(xiaq): AsyncReader relies on the undocumented fact
// that (*os.File).Read returns an *os.File.PathError
e := err.(*os.PathError).Err
if e != syscall.EWOULDBLOCK && e != syscall.EAGAIN {
panic(err)
}
}
}
@ -100,6 +94,10 @@ func (ar *AsyncReader) Quit() {
if err != nil {
panic(err)
}
select {
case <-ar.ch:
default:
}
<-ar.ackCtrl
}