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

Why were we using gettimeofday() in second_elapsed_callback? We were only ever looking at the tv_sec field.

Browse Source 
svn:r17691
This commit is contained in:
Nick Mathewson 2008-12-18 17:19:23 +00:00
parent bf80e2df3f
commit c3e4b12e7f
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/or/main.c
View File

@ -1173,7 +1173,7 @@ second_elapsed_callback(int fd, short event, void *args)
* time against a bunch of timeouts every second. */
static struct timeval one_second;
static long current_second = 0;
struct timeval now;
time_t now;
size_t bytes_written;
size_t bytes_read;
int seconds_elapsed;
@ -1191,13 +1191,13 @@ second_elapsed_callback(int fd, short event, void *args)
n_libevent_errors = 0;
/* log_fn(LOG_NOTICE, "Tick."); */
tor_gettimeofday(&now);
update_approx_time(now.tv_sec);
now = time(NULL);
update_approx_time(now);
/* the second has rolled over. check more stuff. */
bytes_written = stats_prev_global_write_bucket - global_write_bucket;
bytes_read = stats_prev_global_read_bucket - global_read_bucket;
seconds_elapsed = current_second ? (int)(now.tv_sec - current_second) : 0;
seconds_elapsed = current_second ? (int)(now - current_second) : 0;
stats_n_bytes_read += bytes_read;
stats_n_bytes_written += bytes_written;
if (accounting_is_enabled(options) && seconds_elapsed >= 0)
@ -1206,7 +1206,7 @@ second_elapsed_callback(int fd, short event, void *args)
control_event_stream_bandwidth_used();
if (seconds_elapsed > 0)
connection_bucket_refill(seconds_elapsed, now.tv_sec);
connection_bucket_refill(seconds_elapsed, now);
stats_prev_global_read_bucket = global_read_bucket;
stats_prev_global_write_bucket = global_write_bucket;
@ -1243,9 +1243,9 @@ second_elapsed_callback(int fd, short event, void *args)
} else if (seconds_elapsed > 0)
stats_n_seconds_working += seconds_elapsed;
run_scheduled_events(now.tv_sec);
run_scheduled_events(now);
current_second = now.tv_sec; /* remember which second it is, for next time */
current_second = now; /* remember which second it is, for next time */
#if 0
if (current_second % 300 == 0) {