From dc586c25206a4b41a7d8c505e3700f5704134228 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@lukeshu.com>
Date: Thu, 5 Jan 2023 19:20:25 -0700
Subject: containers: Add SyncValue and SyncPool types

---
 lib/textui/progress.go | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'lib/textui/progress.go')

diff --git a/lib/textui/progress.go b/lib/textui/progress.go
index 68d986f..1a5e7d8 100644
--- a/lib/textui/progress.go
+++ b/lib/textui/progress.go
@@ -7,10 +7,11 @@ package textui
 import (
 	"context"
 	"fmt"
-	"sync/atomic"
 	"time"
 
 	"github.com/datawire/dlib/dlog"
+
+	"git.lukeshu.com/btrfs-progs-ng/lib/containers"
 )
 
 type Stats interface {
@@ -26,7 +27,7 @@ type Progress[T Stats] struct {
 	cancel context.CancelFunc
 	done   chan struct{}
 
-	cur     atomic.Value // Value[T]
+	cur     containers.SyncValue[T]
 	oldStat T
 	oldLine string
 }
@@ -45,7 +46,7 @@ func NewProgress[T Stats](ctx context.Context, lvl dlog.LogLevel, interval time.
 }
 
 func (p *Progress[T]) Set(val T) {
-	if p.cur.Swap(val) == nil {
+	if _, hadOld := p.cur.Swap(val); !hadOld {
 		go p.run()
 	}
 }
@@ -56,8 +57,10 @@ func (p *Progress[T]) Done() {
 }
 
 func (p *Progress[T]) flush(force bool) {
-	//nolint:forcetypeassert // It wasn't worth it to me (yet?) to make a typed wrapper around atomic.Value.
-	cur := p.cur.Load().(T)
+	cur, ok := p.cur.Load()
+	if !ok {
+		panic("should not happen")
+	}
 	if !force && cur == p.oldStat {
 		return
 	}
-- 
cgit v1.2.3-54-g00ecf