mirror of
https://git.sr.ht/~rjarry/aerc
synced 2025-10-13 20:05:15 +02:00
51fd25c0f1
When reloading the configuration with :reload, global variables in the
config package are reset to their startup values and then, the config is
parsed from disk. While the parsing is done, these variables are
temporarily in an inconsistent and possibly invalid state.
When commands are executed interactively from aerc, they are handled by
the main goroutine which also deals with UI rendering. No UI render will
be done while :reload is in progress.
However, the IPC socket handler runs in an independent goroutine. This
has the unfortunate side effect to let the UI goroutine to run while
config parsing is in progress and causes crashes:
[signal SIGSEGV: segmentation violation code=0x1 addr=0x0 pc=0x6bb142]
goroutine 1 [running]:
git.sr.ht/~rjarry/aerc/lib/log.PanicHandler()
lib/log/panic-logger.go:51 +0x6cf
panic({0xc1d960?, 0x134a6e0?})
/usr/lib/go/src/runtime/panic.go:783 +0x132
git.sr.ht/~rjarry/aerc/config.(*StyleConf).getStyle(0xc00038b908?, 0x4206b7?)
config/style.go:386 +0x42
git.sr.ht/~rjarry/aerc/config.StyleSet.Get({0x0, 0x0, 0x0, {0x0, 0x0, 0x0}}, 0x421a65?, 0x0)
config/style.go:408 +0x8b
git.sr.ht/~rjarry/aerc/config.(*UIConfig).GetStyle(...)
config/ui.go:379
git.sr.ht/~rjarry/aerc/lib/ui.(*TabStrip).Draw(0xc000314700, 0xc000192230)
lib/ui/tab.go:378 +0x15b
git.sr.ht/~rjarry/aerc/lib/ui.(*Grid).Draw(0xc000186fc0, 0xc0002c25f0)
lib/ui/grid.go:126 +0x28e
git.sr.ht/~rjarry/aerc/app.(*Aerc).Draw(0x14b9f00, 0xc0002c25f0)
app/aerc.go:192 +0x1fe
git.sr.ht/~rjarry/aerc/lib/ui.Render()
lib/ui/ui.go:155 +0x16b
main.main()
main.go:310 +0x997
Make the reload operation safe by changing how config objects are
exposed and updated. Change all objects to be atomic pointers. Expose
public functions to access their value atomically. Only update their
value after a complete and successful config parse. This way the UI
thread will always have access to a valid configuration.
NB: The account configuration is not included in this change since it
cannot be reloaded.
Fixes: https://todo.sr.ht/~rjarry/aerc/319
Reported-by: Anachron <gith@cron.world>
Signed-off-by: Robin Jarry <robin@jarry.cc>
99 lines
1.4 KiB
Go
99 lines
1.4 KiB
Go
package state
|
|
|
|
import (
|
|
"strings"
|
|
|
|
"git.sr.ht/~rjarry/aerc/config"
|
|
)
|
|
|
|
type texterInterface interface {
|
|
Connected() string
|
|
Disconnected() string
|
|
Passthrough() string
|
|
Sorting() string
|
|
Threading() string
|
|
Visual() string
|
|
FormatFilter(string) string
|
|
FormatSearch(string) string
|
|
}
|
|
|
|
type text struct{}
|
|
|
|
var txt text
|
|
|
|
func (t text) Connected() string {
|
|
return "Connected"
|
|
}
|
|
|
|
func (t text) Disconnected() string {
|
|
return "Disconnected"
|
|
}
|
|
|
|
func (t text) Passthrough() string {
|
|
return "passthrough"
|
|
}
|
|
|
|
func (t text) Sorting() string {
|
|
return "sorting"
|
|
}
|
|
|
|
func (t text) Threading() string {
|
|
return "threading"
|
|
}
|
|
|
|
func (t text) Visual() string {
|
|
return "visual"
|
|
}
|
|
|
|
func (t text) FormatFilter(s string) string {
|
|
return s
|
|
}
|
|
|
|
func (t text) FormatSearch(s string) string {
|
|
return s
|
|
}
|
|
|
|
type icon struct{}
|
|
|
|
var icn icon
|
|
|
|
func (i icon) Connected() string {
|
|
return "✓"
|
|
}
|
|
|
|
func (i icon) Disconnected() string {
|
|
return "✘"
|
|
}
|
|
|
|
func (i icon) Passthrough() string {
|
|
return "➔"
|
|
}
|
|
|
|
func (i icon) Sorting() string {
|
|
return "⚙"
|
|
}
|
|
|
|
func (i icon) Threading() string {
|
|
return "🧵"
|
|
}
|
|
|
|
func (i icon) Visual() string {
|
|
return "🕶"
|
|
}
|
|
|
|
func (i icon) FormatFilter(s string) string {
|
|
return strings.ReplaceAll(s, "filter", "🔦")
|
|
}
|
|
|
|
func (i icon) FormatSearch(s string) string {
|
|
return strings.ReplaceAll(s, "search", "🔎")
|
|
}
|
|
|
|
func texter() texterInterface {
|
|
switch strings.ToLower(config.Statusline().DisplayMode) {
|
|
case "icon":
|
|
return &icn
|
|
default:
|
|
return &txt
|
|
}
|
|
}
|