alexvanin/restic
1
0
Fork 0
forked from TrueCloudLab/restic
Code Pull requests Activity

Merge pull request #3986 from greatroar/counter

Browse source 
ui/progress: Load both values in a single Lock/Unlock
This commit is contained in:
Michael Eischer 2022-10-29 21:50:55 +02:00 committed by GitHub
commit 7c87fb941c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
internal/restic/find_test.go
View file

@ -110,7 +110,8 @@ func TestFindUsedBlobs(t *testing.T) {
continue
}
test.Equals(t, p.Get(), uint64(i+1))
v, _ := p.Get()
test.Equals(t, v, uint64(i+1))
goldenFilename := filepath.Join("testdata", fmt.Sprintf("used_blobs_snapshot%d", i))
want := loadIDSet(t, goldenFilename)
@ -151,7 +152,8 @@ func TestMultiFindUsedBlobs(t *testing.T) {
for i := 1; i < 3; i++ {
err := restic.FindUsedBlobs(context.TODO(), repo, snapshotTrees, usedBlobs, p)
test.OK(t, err)
test.Equals(t, p.Get(), uint64(i*len(snapshotTrees)))
v, _ := p.Get()
test.Equals(t, v, uint64(i*len(snapshotTrees)))
if !want.Equals(usedBlobs) {
t.Errorf("wrong list of blobs returned:\n missing blobs: %v\n extra blobs: %v",

26
internal/ui/progress/counter.go
View file

@ -78,32 +78,25 @@ func (c *Counter) Done() {
c.tick.Stop()
}
close(c.stop)
<-c.stopped // Wait for last progress report.
*c = Counter{} // Prevent reuse.
<-c.stopped // Wait for last progress report.
}
// Get the current Counter value. This method is concurrency-safe.
func (c *Counter) Get() uint64 {
// Get returns the current value and the maximum of c.
// This method is concurrency-safe.
func (c *Counter) Get() (v, max uint64) {
c.valueMutex.Lock()
v := c.value
v, max = c.value, c.max
c.valueMutex.Unlock()
return v
}
func (c *Counter) getMax() uint64 {
c.valueMutex.Lock()
max := c.max
c.valueMutex.Unlock()
return max
return v, max
}
func (c *Counter) run() {
defer close(c.stopped)
defer func() {
// Must be a func so that time.Since isn't called at defer time.
c.report(c.Get(), c.getMax(), time.Since(c.start), true)
v, max := c.Get()
c.report(v, max, time.Since(c.start), true)
}()
var tick <-chan time.Time
@ -123,6 +116,7 @@ func (c *Counter) run() {
return
}
c.report(c.Get(), c.getMax(), now.Sub(c.start), false)
v, max := c.Get()
c.report(v, max, now.Sub(c.start), false)
}
}