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

Merge pull request #3055 from greatroar/cleanup

Browse source 
Don't separately allocate sync.{Mutex,Once} if not necessary
This commit is contained in:
Alexander Neumann 2020-11-04 11:11:21 +01:00 committed by GitHub
commit a06f5c28c0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
internal/fs/fs_local_vss.go
View file

@ -21,7 +21,7 @@ type LocalVss struct {
FS FS
snapshots map[string]VssSnapshot snapshots map[string]VssSnapshot
failedSnapshots map[string]struct{} failedSnapshots map[string]struct{}
mutex *sync.RWMutex mutex sync.RWMutex
msgError ErrorHandler msgError ErrorHandler
msgMessage MessageHandler msgMessage MessageHandler
} }
@ -36,7 +36,6 @@ func NewLocalVss(msgError ErrorHandler, msgMessage MessageHandler) *LocalVss {
FS: Local{}, FS: Local{},
snapshots: make(map[string]VssSnapshot), snapshots: make(map[string]VssSnapshot),
failedSnapshots: make(map[string]struct{}), failedSnapshots: make(map[string]struct{}),
mutex: &sync.RWMutex{},
msgError: msgError, msgError: msgError,
msgMessage: msgMessage, msgMessage: msgMessage,
} }

5
internal/restic/progress.go
View file

@ -40,7 +40,7 @@ type Progress struct {
start time.Time start time.Time
c *time.Ticker c *time.Ticker
cancel chan struct{} cancel chan struct{}
o *sync.Once once sync.Once
d time.Duration d time.Duration
lastUpdate time.Time lastUpdate time.Time
@ -79,7 +79,6 @@ func (p *Progress) Start() {
return return
} }
p.o = &sync.Once{}
p.cancel = make(chan struct{}) p.cancel = make(chan struct{})
p.running = true p.running = true
p.Reset() p.Reset()
@ -187,7 +186,7 @@ func (p *Progress) Done() {
} }
p.running = false p.running = false
p.o.Do(func() { p.once.Do(func() {
close(p.cancel) close(p.cancel)
}) })