diff options
| author | Nick Mathewson <nickm@torproject.org> | 2004-11-14 22:21:23 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2004-11-14 22:21:23 +0000 |
| commit | 3e6edf20cca98c01d73285ac1ce1f61f4e3e6d99 (patch) | |
| tree | f59bf38b4e3846c942bd53c12c044e75b719a212 /src/or/hibernate.c | |
| parent | 402c75fb0616d03e006aed2504b24a266685a4a4 (diff) | |
| download | tor-3e6edf20cca98c01d73285ac1ce1f61f4e3e6d99.tar.gz tor-3e6edf20cca98c01d73285ac1ce1f61f4e3e6d99.zip | |
Resolve some hibernating-related XXXX009s.
svn:r2875
Diffstat (limited to 'src/or/hibernate.c')
| -rw-r--r-- | src/or/hibernate.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/or/hibernate.c b/src/or/hibernate.c index af0205841f..59990084e3 100644 --- a/src/or/hibernate.c +++ b/src/or/hibernate.c @@ -83,7 +83,6 @@ static uint32_t expected_bandwidth_usage = 0; static void reset_accounting(time_t now); static int read_bandwidth_usage(void); -static int record_bandwidth_usage(time_t now); static time_t start_of_accounting_period_after(time_t now); static time_t start_of_accounting_period_containing(time_t now); static void accounting_set_wakeup_time(void); @@ -316,12 +315,11 @@ accounting_set_wakeup_time(void) (int)(unsigned char)digest[0], buf); } -/* XXXX009 This should also get called on HUP and shutdown. */ #define BW_ACCOUNTING_VERSION 1 /** Save all our bandwidth tracking information to disk. Return 0 on * success, -1 on failure*/ -static int -record_bandwidth_usage(time_t now) +int +accounting_record_bandwidth_usage(time_t now) { char buf[128]; char fname[512]; @@ -483,7 +481,7 @@ static void hibernate_begin(int new_state, time_t now) { } hibernate_state = new_state; - record_bandwidth_usage(time(NULL)); + accounting_record_bandwidth_usage(now); } /** Called when we've been hibernating and our timeout is reached. */ @@ -539,7 +537,7 @@ hibernate_go_dormant(time_t now) { connection_mark_for_close(conn); } - record_bandwidth_usage(time(NULL)); + accounting_record_bandwidth_usage(now); } /** Called when hibernate_end_time has arrived. */ |