_/aerc
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

lib/ui: fix UI.Exit race condition

Browse source 
UI.Exit can be accessed from goroutines drawing, goroutines executing
commands and goroutines waiting for events.

    Write at 0x00c0002b2040 by main goroutine:
      main.main.func1()
          /home/simon/src/aerc2/aerc.go:76 +0x33d
      git.sr.ht/~sircmpwn/aerc2/widgets.(*Aerc).BeginExCommand.func1()
          /home/simon/src/aerc2/widgets/aerc.go:245 +0x89
      git.sr.ht/~sircmpwn/aerc2/widgets.(*ExLine).Event()
          /home/simon/src/aerc2/widgets/exline.go:131 +0x442
      git.sr.ht/~sircmpwn/aerc2/widgets.(*Aerc).Event()
          /home/simon/src/aerc2/widgets/aerc.go:116 +0x83c
      git.sr.ht/~sircmpwn/aerc2/widgets.(*Aerc).simulate()
          /home/simon/src/aerc2/widgets/aerc.go:109 +0x12a
      git.sr.ht/~sircmpwn/aerc2/widgets.(*Aerc).Event()
          /home/simon/src/aerc2/widgets/aerc.go:142 +0x722
      git.sr.ht/~sircmpwn/aerc2/lib/ui.(*UI).Tick()
          /home/simon/src/aerc2/lib/ui/ui.go:75 +0x33f
      main.main()
          /home/simon/src/aerc2/aerc.go:94 +0x497

    Previous read at 0x00c0002b2040 by goroutine 19:
      git.sr.ht/~sircmpwn/aerc2/lib/ui.Initialize.func1()
          /home/simon/src/aerc2/lib/ui/ui.go:45 +0x97

    Goroutine 19 (running) created at:
      git.sr.ht/~sircmpwn/aerc2/lib/ui.Initialize()
          /home/simon/src/aerc2/lib/ui/ui.go:44 +0x372
      main.main()
          /home/simon/src/aerc2/aerc.go:87 +0x3a9
This commit is contained in:
Simon Ser 2019-05-04 14:31:16 +00:00 committed by Drew DeVault
parent 5feb7dede9
commit de122b16ee
2 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
aerc.go
View file

@ -73,7 +73,7 @@ func main() {
continue continue
} }
} else if _, ok := err.(commands.ErrorExit); ok { } else if _, ok := err.(commands.ErrorExit); ok {
ui.Exit = true ui.Exit()
return nil return nil
} else if err != nil { } else if err != nil {
return err return err
@ -90,7 +90,7 @@ func main() {
} }
defer ui.Close() defer ui.Close()
for !ui.Exit { for !ui.ShouldExit() {
if !ui.Tick() { if !ui.Tick() {
// ~60 FPS // ~60 FPS
time.Sleep(16 * time.Millisecond) time.Sleep(16 * time.Millisecond)

15
lib/ui/ui.go
View file

@ -1,14 +1,16 @@
package ui package ui
import ( import (
"sync/atomic"
"github.com/gdamore/tcell" "github.com/gdamore/tcell"
"git.sr.ht/~sircmpwn/aerc2/config" "git.sr.ht/~sircmpwn/aerc2/config"
) )
type UI struct { type UI struct {
Exit bool
Content DrawableInteractive Content DrawableInteractive
exit atomic.Value
ctx *Context ctx *Context
screen tcell.Screen screen tcell.Screen
@ -41,8 +43,9 @@ func Initialize(conf *config.AercConfig,
tcEvents: make(chan tcell.Event, 10), tcEvents: make(chan tcell.Event, 10),
invalidations: make(chan interface{}), invalidations: make(chan interface{}),
} }
state.exit.Store(false)
go (func() { go (func() {
for !state.Exit { for !state.ShouldExit() {
state.tcEvents <- screen.PollEvent() state.tcEvents <- screen.PollEvent()
} }
})() })()
@ -58,6 +61,14 @@ func Initialize(conf *config.AercConfig,
return &state, nil return &state, nil
} }
func (state *UI) ShouldExit() bool {
return state.exit.Load().(bool)
}
func (state *UI) Exit() {
state.exit.Store(true)
}
func (state *UI) Close() { func (state *UI) Close() {
state.screen.Fini() state.screen.Fini()
} }