mirror
/
readline
mirror of https://github.com/chzyer/readline.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Fix a race condition in Refresh and wrapWriter 

These functions would bypass calling RuneBuffer.Refresh when
Terminal.IsReading(), but this leads to a race condition when another
goroutine is just beginning to read. The result is that the prompt is
not erased or rewritten in some cases.

RuneBuffer.Refresh protects this with a mutex, and looks safe to call
even when !IsReading(), so removing these redundant checks seems
sufficient.

The tested scenario is to have goroutine A calling Readline in a loop
and handling commands, and goroutine B periodically printing to
Instance.Stdout(). If the print in B is timed just before A calls
Readline, the printed line is displayed after the prompt and the prompt
is not reprinted until the next input.
This commit is contained in:
John Brooks 2016-10-23 08:22:52 -07:00
parent 41eea22f71
commit e06700a8ff
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
operation.go
View File

@ -43,10 +43,6 @@ type wrapWriter struct {
} }
func (w *wrapWriter) Write(b []byte) (int, error) { func (w *wrapWriter) Write(b []byte) (int, error) {
if !w.t.IsReading() {
return w.target.Write(b)
}
var ( var (
n int n int
err error err error
@ -478,10 +474,8 @@ func (o *Operation) SaveHistory(content string) error {
} }
func (o *Operation) Refresh() { func (o *Operation) Refresh() {
if o.t.IsReading() {
o.buf.Refresh(nil) o.buf.Refresh(nil)
} }
}
func (o *Operation) Clean() { func (o *Operation) Clean() {
o.buf.Clean() o.buf.Clean()