Merge remote-tracking branch 'public/bug13988_025'

This commit is contained in:
Nick Mathewson 2015-01-07 11:45:24 -05:00
commit 7dd852835c
2 changed files with 4 additions and 3 deletions

3
changes/bug13988 Normal file
View File

@ -0,0 +1,3 @@
o Minor bugfixes (statistics):
- Increase period over which bandwidth observations are aggregated
from 15 minutes to 4 hours. Fixes bug 13988; bugfix on 0.0.8pre1.

View File

@ -1131,9 +1131,7 @@ rep_hist_load_mtbf_data(time_t now)
* totals? */ * totals? */
#define NUM_SECS_ROLLING_MEASURE 10 #define NUM_SECS_ROLLING_MEASURE 10
/** How large are the intervals for which we track and report bandwidth use? */ /** How large are the intervals for which we track and report bandwidth use? */
/* XXXX Watch out! Before Tor 0.2.2.21-alpha, using any other value here would #define NUM_SECS_BW_SUM_INTERVAL (4*60*60)
* generate an unparseable state file. */
#define NUM_SECS_BW_SUM_INTERVAL (15*60)
/** How far in the past do we remember and publish bandwidth use? */ /** How far in the past do we remember and publish bandwidth use? */
#define NUM_SECS_BW_SUM_IS_VALID (24*60*60) #define NUM_SECS_BW_SUM_IS_VALID (24*60*60)
/** How many bandwidth usage intervals do we remember? (derived) */ /** How many bandwidth usage intervals do we remember? (derived) */