Mercurial > templog
changeset 405:d9b78a1bdd1d
fix off-by-one in remainder code
author | Matt Johnston <matt@ucc.asn.au> |
---|---|
date | Tue, 17 Jul 2012 21:58:49 +0800 |
parents | 56c32a62b0cd |
children | 594d8be26bfb 36a33c56c383 |
files | server/ts.py web/log.py |
diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/server/ts.py Mon Jul 16 22:01:33 2012 +0800 +++ b/server/ts.py Tue Jul 17 21:58:49 2012 +0800 @@ -108,7 +108,7 @@ rem = int(toks['rem']) tick_secs = int(toks['tick_secs']) - tick_secs = int(toks['tick_wake']) + tick_wake = int(toks['tick_wake']) + 1 next_wake = int(toks['next_wake']) rem_secs = float(rem) / tick_wake * tick_secs
--- a/web/log.py Mon Jul 16 22:01:33 2012 +0800 +++ b/web/log.py Tue Jul 17 21:58:49 2012 +0800 @@ -161,7 +161,7 @@ def time_rem(name, entries): val_ticks = int(entries[name]) val_rem = int(entries['%s_rem' % name]) - tick_wake = int(entries['tick_wake']) + tick_wake = int(entries['tick_wake']) + 1 tick_secs = int(entries['tick_secs']) return val_ticks + float(val_rem) * tick_secs / tick_wake