From 54a0a377e03074a27d7d9e84092487c55761b510 Mon Sep 17 00:00:00 2001 From: Koni Marti Date: Tue, 26 Jul 2022 15:41:13 +0200 Subject: threads: debounce client-side thread building Debounce client-side thread building in the message store. Debouncing is useful when multiple messages are loaded, i.e. when scrolling with PgUp/PgDown. Without the debouncing, all client-side threads will be built everytime the message store is updated which creates a noticable lag in the message list ui when client-side threading is activated. The default debouncing delay can be changed by changing 'client-threads-delay' in the UI config section. Signed-off-by: Koni Marti Acked-by: Robin Jarry --- lib/threadbuilder.go | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'lib/threadbuilder.go') diff --git a/lib/threadbuilder.go b/lib/threadbuilder.go index 59abd2f6..ce56afe6 100644 --- a/lib/threadbuilder.go +++ b/lib/threadbuilder.go @@ -1,6 +1,7 @@ package lib import ( + "sync" "time" "git.sr.ht/~rjarry/aerc/logging" @@ -10,6 +11,7 @@ import ( ) type ThreadBuilder struct { + sync.Mutex threadBlocks map[uint32]jwz.Threadable messageidToUid map[string]uint32 seen map[uint32]bool @@ -27,6 +29,9 @@ func NewThreadBuilder() *ThreadBuilder { // Uids returns the uids in threading order func (builder *ThreadBuilder) Uids() []uint32 { + builder.Lock() + defer builder.Unlock() + if builder.threadedUids == nil { return []uint32{} } @@ -35,6 +40,9 @@ func (builder *ThreadBuilder) Uids() []uint32 { // Update updates the thread builder with a new message header func (builder *ThreadBuilder) Update(msg *models.MessageInfo) { + builder.Lock() + defer builder.Unlock() + if msg != nil { if threadable := newThreadable(msg); threadable != nil { builder.messageidToUid[threadable.MessageThreadID()] = msg.Uid @@ -45,6 +53,9 @@ func (builder *ThreadBuilder) Update(msg *models.MessageInfo) { // Threads returns a slice of threads for the given list of uids func (builder *ThreadBuilder) Threads(uids []uint32) []*types.Thread { + builder.Lock() + defer builder.Unlock() + start := time.Now() threads := builder.buildAercThreads(builder.generateStructure(uids), uids) -- cgit