Merge pull request #20 from tendermint/bugfix/16-flowrate
[flowrate] refactor clock functions (Refs #16)
This commit is contained in:
commit
c332a21fb2
|
@ -6,7 +6,6 @@ package flowrate
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"bytes"
|
"bytes"
|
||||||
"reflect"
|
|
||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
|
@ -90,8 +89,8 @@ func TestReader(t *testing.T) {
|
||||||
Status{false, start, _300ms, 0, 20, 3, 0, 0, 67, 100, 0, 0, 0},
|
Status{false, start, _300ms, 0, 20, 3, 0, 0, 67, 100, 0, 0, 0},
|
||||||
}
|
}
|
||||||
for i, s := range status {
|
for i, s := range status {
|
||||||
if !reflect.DeepEqual(&s, &want[i]) {
|
if !statusesAreEqual(&s, &want[i]) {
|
||||||
t.Errorf("r.Status(%v) expected %v; got %v", i, want[i], s)
|
t.Errorf("r.Status(%v)\nexpected: %v\ngot : %v", i, want[i], s)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if !bytes.Equal(b[:20], in[:20]) {
|
if !bytes.Equal(b[:20], in[:20]) {
|
||||||
|
@ -136,11 +135,55 @@ func TestWriter(t *testing.T) {
|
||||||
Status{true, start, _500ms, _100ms, 100, 5, 200, 200, 200, 200, 0, 0, 100000},
|
Status{true, start, _500ms, _100ms, 100, 5, 200, 200, 200, 200, 0, 0, 100000},
|
||||||
}
|
}
|
||||||
for i, s := range status {
|
for i, s := range status {
|
||||||
if !reflect.DeepEqual(&s, &want[i]) {
|
if !statusesAreEqual(&s, &want[i]) {
|
||||||
t.Errorf("w.Status(%v) expected %v; got %v", i, want[i], s)
|
t.Errorf("w.Status(%v)\nexpected: %v\ngot : %v\n", i, want[i], s)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if !bytes.Equal(b, w.Writer.(*bytes.Buffer).Bytes()) {
|
if !bytes.Equal(b, w.Writer.(*bytes.Buffer).Bytes()) {
|
||||||
t.Errorf("w.Write() input doesn't match output")
|
t.Errorf("w.Write() input doesn't match output")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const maxDeviationForDuration = 50 * time.Millisecond
|
||||||
|
const maxDeviationForRate int64 = 50
|
||||||
|
|
||||||
|
// statusesAreEqual returns true if s1 is equal to s2. Equality here means
|
||||||
|
// general equality of fields except for the duration and rates, which can
|
||||||
|
// drift due to unpredictable delays (e.g. thread wakes up 25ms after
|
||||||
|
// `time.Sleep` has ended).
|
||||||
|
func statusesAreEqual(s1 *Status, s2 *Status) bool {
|
||||||
|
if s1.Active == s2.Active &&
|
||||||
|
s1.Start == s2.Start &&
|
||||||
|
durationsAreEqual(s1.Duration, s2.Duration, maxDeviationForDuration) &&
|
||||||
|
s1.Idle == s2.Idle &&
|
||||||
|
s1.Bytes == s2.Bytes &&
|
||||||
|
s1.Samples == s2.Samples &&
|
||||||
|
ratesAreEqual(s1.InstRate, s2.InstRate, maxDeviationForRate) &&
|
||||||
|
ratesAreEqual(s1.CurRate, s2.CurRate, maxDeviationForRate) &&
|
||||||
|
ratesAreEqual(s1.AvgRate, s2.AvgRate, maxDeviationForRate) &&
|
||||||
|
ratesAreEqual(s1.PeakRate, s2.PeakRate, maxDeviationForRate) &&
|
||||||
|
s1.BytesRem == s2.BytesRem &&
|
||||||
|
durationsAreEqual(s1.TimeRem, s2.TimeRem, maxDeviationForDuration) &&
|
||||||
|
s1.Progress == s2.Progress {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
func durationsAreEqual(d1 time.Duration, d2 time.Duration, maxDeviation time.Duration) bool {
|
||||||
|
if d2-d1 <= maxDeviation {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
func ratesAreEqual(r1 int64, r2 int64, maxDeviation int64) bool {
|
||||||
|
sub := r1 - r2
|
||||||
|
if sub < 0 {
|
||||||
|
sub = -sub
|
||||||
|
}
|
||||||
|
if sub <= maxDeviation {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
|
@ -15,16 +15,16 @@ const clockRate = 20 * time.Millisecond
|
||||||
|
|
||||||
// czero is the process start time rounded down to the nearest clockRate
|
// czero is the process start time rounded down to the nearest clockRate
|
||||||
// increment.
|
// increment.
|
||||||
var czero = time.Duration(time.Now().UnixNano()) / clockRate * clockRate
|
var czero = time.Now().Round(clockRate)
|
||||||
|
|
||||||
// clock returns a low resolution timestamp relative to the process start time.
|
// clock returns a low resolution timestamp relative to the process start time.
|
||||||
func clock() time.Duration {
|
func clock() time.Duration {
|
||||||
return time.Duration(time.Now().UnixNano())/clockRate*clockRate - czero
|
return time.Now().Round(clockRate).Sub(czero)
|
||||||
}
|
}
|
||||||
|
|
||||||
// clockToTime converts a clock() timestamp to an absolute time.Time value.
|
// clockToTime converts a clock() timestamp to an absolute time.Time value.
|
||||||
func clockToTime(c time.Duration) time.Time {
|
func clockToTime(c time.Duration) time.Time {
|
||||||
return time.Unix(0, int64(czero+c))
|
return czero.Add(c)
|
||||||
}
|
}
|
||||||
|
|
||||||
// clockRound returns d rounded to the nearest clockRate increment.
|
// clockRound returns d rounded to the nearest clockRate increment.
|
||||||
|
|
Loading…
Reference in New Issue