TrueCloudLab/restic
16
0
Fork 2
Code Issues 1 Pull requests 1 Projects Releases Packages Wiki Activity Actions 1

Merge pull request #3189 from restic/fix-counter-segfault

Browse source 
ui/progress: Use mutex instead of atomic
This commit is contained in:
MichaelEischer 2020-12-22 22:14:08 +01:00 committed by GitHub
commit 69f9d269eb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3,7 +3,6 @@ package progress
import ( import (
"os" "os"
"sync" "sync"
"sync/atomic"
"time" "time"
"github.com/restic/restic/internal/debug" "github.com/restic/restic/internal/debug"
@ -25,7 +24,9 @@ type Counter struct {
stopped chan struct{} // Closed by run. stopped chan struct{} // Closed by run.
stop chan struct{} // Close to stop run. stop chan struct{} // Close to stop run.
tick *time.Ticker tick *time.Ticker
value uint64
valueMutex sync.Mutex
value uint64
} }
// New starts a new Counter. // New starts a new Counter.
@ -52,7 +53,10 @@ func (c *Counter) Add(v uint64) {
if c == nil { if c == nil {
return return
} }
atomic.AddUint64(&c.value, v)
c.valueMutex.Lock()
c.value += v
c.valueMutex.Unlock()
} }
// Done tells a Counter to stop and waits for it to report its final value. // Done tells a Counter to stop and waits for it to report its final value.
@ -66,7 +70,13 @@ func (c *Counter) Done() {
*c = Counter{} // Prevent reuse. *c = Counter{} // Prevent reuse.
} }
func (c *Counter) get() uint64 { return atomic.LoadUint64(&c.value) } func (c *Counter) get() uint64 {
c.valueMutex.Lock()
v := c.value
c.valueMutex.Unlock()
return v
}
func (c *Counter) run() { func (c *Counter) run() {
defer close(c.stopped) defer close(c.stopped)