perso/syncthing-arm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lib/sync: Make some tests not depend on real clock

Browse Source 
GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/4065
This commit is contained in:
Jakob Borg
2017-04-01 11:03:11 +00:00
committed by Audrius Butkevicius
parent 25b314f5f1
commit 2ff08e6c84
2 changed files with 83 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/sync/sync.go
View File

@@ -19,6 +19,12 @@ import (
"github.com/sasha-s/go-deadlock"
)
type clock interface {
Now() time.Time
}
var defaultClock clock = (*standardClock)(nil)
type Mutex interface {
Lock()
Unlock()
@@ -80,7 +86,7 @@ func (h holder) String() string {
if h.at == "" {
return "not held"
}
return fmt.Sprintf("at %s goid: %d for %s", h.at, h.goid, time.Since(h.time))
return fmt.Sprintf("at %s goid: %d for %s", h.at, h.goid, defaultClock.Now().Sub(h.time))
}
type loggedMutex struct {
@@ -95,7 +101,7 @@ func (m *loggedMutex) Lock() {
func (m *loggedMutex) Unlock() {
currentHolder := m.holder.Load().(holder)
duration := time.Since(currentHolder.time)
duration := defaultClock.Now().Sub(currentHolder.time)
if duration >= threshold {
l.Debugf("Mutex held for %v. Locked at %s unlocked at %s", duration, currentHolder.at, getHolder().at)
}
@@ -119,7 +125,7 @@ type loggedRWMutex struct {
}
func (m *loggedRWMutex) Lock() {
start := time.Now()
start := defaultClock.Now()
atomic.StoreInt32(&m.logUnlockers, 1)
m.RWMutex.Lock()
@@ -147,7 +153,7 @@ func (m *loggedRWMutex) Lock() {
func (m *loggedRWMutex) Unlock() {
currentHolder := m.holder.Load().(holder)
duration := time.Since(currentHolder.time)
duration := defaultClock.Now().Sub(currentHolder.time)
if duration >= threshold {
l.Debugf("RWMutex held for %v. Locked at %s unlocked at %s", duration, currentHolder.at, getHolder().at)
}
@@ -199,9 +205,9 @@ type loggedWaitGroup struct {
}
func (wg *loggedWaitGroup) Wait() {
start := time.Now()
start := defaultClock.Now()
wg.WaitGroup.Wait()
duration := time.Since(start)
duration := defaultClock.Now().Sub(start)
if duration >= threshold {
l.Debugf("WaitGroup took %v at %s", duration, getHolder())
}
@@ -213,7 +219,7 @@ func getHolder() holder {
return holder{
at: fmt.Sprintf("%s:%d", file, line),
goid: goid(),
time: time.Now(),
time: defaultClock.Now(),
}
}
@@ -294,3 +300,9 @@ func (w *TimeoutCondWaiter) Wait() bool {
func (w *TimeoutCondWaiter) Stop() {
w.timer.Stop()
}
type standardClock struct{}
func (*standardClock) Now() time.Time {
return time.Now()
}