Merge pull request #27 from gerasiov/master

crosbymichael · web-flow · commit 4d8a41f4ce5b · 2018-07-05T12:20:25.000-04:00
console_linux: Fix race: lock Cond before Signal.
diff --git a/console_linux.go b/console_linux.go
@@ -262,10 +262,14 @@ func (ec *EpollConsole) Shutdown(close func(int) error) error {
 
 // signalRead signals that the console is readable.
 func (ec *EpollConsole) signalRead() {
+	ec.readc.L.Lock()
 	ec.readc.Signal()
+	ec.readc.L.Unlock()
 }
 
 // signalWrite signals that the console is writable.
 func (ec *EpollConsole) signalWrite() {
+	ec.writec.L.Lock()
 	ec.writec.Signal()
+	ec.writec.L.Unlock()
 }

Original file line number	Diff line number	Diff line change
`@@ -262,10 +262,14 @@ func (ec *EpollConsole) Shutdown(close func(int) error) error {`
`262`	`262`
`263`	`263`	`// signalRead signals that the console is readable.`
`264`	`264`	`func (ec *EpollConsole) signalRead() {`
	`265`	`+ ec.readc.L.Lock()`
`265`	`266`	`ec.readc.Signal()`
	`267`	`+ ec.readc.L.Unlock()`
`266`	`268`	`}`
`267`	`269`
`268`	`270`	`// signalWrite signals that the console is writable.`
`269`	`271`	`func (ec *EpollConsole) signalWrite() {`
	`272`	`+ ec.writec.L.Lock()`
`270`	`273`	`ec.writec.Signal()`
	`274`	`+ ec.writec.L.Unlock()`
`271`	`275`	`}`