nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-02 16:43:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bug1511'

Browse Source
This commit is contained in:
Nick Mathewson 2010-09-23 23:16:25 -04:00
commit 9b49a89430
2 changed files with 46 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
changes/bug1511 Normal file
View File

@ -0,0 +1,9 @@
o Minor bugfixes:
- Tolerate skew in stored vs computed interval starts for bandwidth
accounting. Now, if we change our configuration so that the start
of the period changes by no more than 50% of the period's duration,
we remember bytes that we transferred in the old one. The upshot
of this is that daylight savings time should no longer mess up
bandwidth accounting and make each period potentially happen
twice. Fixes bug 1511; bugfix on 0.0.9pre5.

46
src/or/hibernate.c
View File

@ -348,29 +348,57 @@ start_of_accounting_period_after(time_t now)
return edge_of_accounting_period_containing(now, 1); return edge_of_accounting_period_containing(now, 1);
} }
/** Return the length of the accounting period containing the time
* <b>now</b>. */
static long
length_of_accounting_period_containing(time_t now)
{
return edge_of_accounting_period_containing(now, 1) -
edge_of_accounting_period_containing(now, 0);
}
/** Initialize the accounting subsystem. */ /** Initialize the accounting subsystem. */
void void
configure_accounting(time_t now) configure_accounting(time_t now)
{ {
time_t s_now;
/* Try to remember our recorded usage. */ /* Try to remember our recorded usage. */
if (!interval_start_time) if (!interval_start_time)
read_bandwidth_usage(); /* If we fail, we'll leave values at zero, and read_bandwidth_usage(); /* If we fail, we'll leave values at zero, and
* reset below.*/ * reset below.*/
if (!interval_start_time ||
start_of_accounting_period_after(interval_start_time) <= now) { s_now = start_of_accounting_period_containing(now);
/* We didn't have recorded usage, or we don't have recorded usage
* for this interval. Start a new interval. */ if (!interval_start_time) {
/* We didn't have recorded usage; Start a new interval. */
log_info(LD_ACCT, "Starting new accounting interval."); log_info(LD_ACCT, "Starting new accounting interval.");
reset_accounting(now); reset_accounting(now);
} else if (interval_start_time == } else if (s_now == interval_start_time) {
start_of_accounting_period_containing(interval_start_time)) {
log_info(LD_ACCT, "Continuing accounting interval."); log_info(LD_ACCT, "Continuing accounting interval.");
/* We are in the interval we thought we were in. Do nothing.*/ /* We are in the interval we thought we were in. Do nothing.*/
interval_end_time = start_of_accounting_period_after(interval_start_time); interval_end_time = start_of_accounting_period_after(interval_start_time);
} else { } else {
log_warn(LD_ACCT, long duration = length_of_accounting_period_containing(now);
"Mismatched accounting interval; starting a fresh one."); double delta = ((double)(s_now - interval_start_time)) / duration;
reset_accounting(now); if (-0.50 <= delta && delta <= 0.50) {
/* The start of the period is now a little later or earlier than we
* remembered. That's fine; we might lose some bytes we could otherwise
* have written, but better to err on the side of obeying people's
* accounting settings. */
log_info(LD_ACCT, "Accounting interval moved by %.02f%%; "
"that's fine.", delta*100);
interval_end_time = start_of_accounting_period_after(now);
} else if (delta >= 0.99) {
/* This is the regular time-moved-forward case; don't be too noisy
* about it or people will complain */
log_info(LD_ACCT, "Accounting interval elapsed; starting a new one");
reset_accounting(now);
} else {
log_warn(LD_ACCT,
"Mismatched accounting interval: moved by %.02f%%. "
"Starting a fresh one.", delta*100);
reset_accounting(now);
}
} }
accounting_set_wakeup_time(); accounting_set_wakeup_time();
} }