diff options
author | Mike Perry <mikeperry-git@torproject.org> | 2018-09-14 18:35:44 +0000 |
---|---|---|
committer | Mike Perry <mikeperry-git@torproject.org> | 2018-09-17 22:19:05 +0000 |
commit | 7dc435e6bc4361ab52eac834eac5d30351f4f7b7 (patch) | |
tree | aa18cfab837032d6e8ba674a1b0536ad8da00cc6 /src/or | |
parent | c02f2d9eb45786c552dcc33c102e9964d95f66c1 (diff) | |
download | tor-7dc435e6bc4361ab52eac834eac5d30351f4f7b7.tar.gz tor-7dc435e6bc4361ab52eac834eac5d30351f4f7b7.zip |
Promote rep_hist bw functions to uint64_t.
The rest of rephist uses uint64_t internally. Let's make these take it too,
so we don't have to worry about overflowing size_t on 32 bit systems.
Diffstat (limited to 'src/or')
-rw-r--r-- | src/or/rephist.c | 8 | ||||
-rw-r--r-- | src/or/rephist.h | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/or/rephist.c b/src/or/rephist.c index f0bac57898..7223c3759b 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -1363,7 +1363,7 @@ bw_arrays_init(void) * earlier than the latest <b>when</b> you've heard of. */ void -rep_hist_note_bytes_written(size_t num_bytes, time_t when) +rep_hist_note_bytes_written(uint64_t num_bytes, time_t when) { /* Maybe a circular array for recent seconds, and step to a new point * every time a new second shows up. Or simpler is to just to have @@ -1380,7 +1380,7 @@ rep_hist_note_bytes_written(size_t num_bytes, time_t when) * (like rep_hist_note_bytes_written() above) */ void -rep_hist_note_bytes_read(size_t num_bytes, time_t when) +rep_hist_note_bytes_read(uint64_t num_bytes, time_t when) { /* if we're smart, we can make this func and the one above share code */ add_obs(read_array, when, num_bytes); @@ -1390,7 +1390,7 @@ rep_hist_note_bytes_read(size_t num_bytes, time_t when) * <b>when</b>. (like rep_hist_note_bytes_written() above) */ void -rep_hist_note_dir_bytes_written(size_t num_bytes, time_t when) +rep_hist_note_dir_bytes_written(uint64_t num_bytes, time_t when) { add_obs(dir_write_array, when, num_bytes); } @@ -1399,7 +1399,7 @@ rep_hist_note_dir_bytes_written(size_t num_bytes, time_t when) * <b>when</b>. (like rep_hist_note_bytes_written() above) */ void -rep_hist_note_dir_bytes_read(size_t num_bytes, time_t when) +rep_hist_note_dir_bytes_read(uint64_t num_bytes, time_t when) { add_obs(dir_read_array, when, num_bytes); } diff --git a/src/or/rephist.h b/src/or/rephist.h index ff4810a56d..c1fc7ef1aa 100644 --- a/src/or/rephist.h +++ b/src/or/rephist.h @@ -21,13 +21,13 @@ void rep_hist_note_extend_succeeded(const char *from_name, const char *to_name); void rep_hist_note_extend_failed(const char *from_name, const char *to_name); void rep_hist_dump_stats(time_t now, int severity); -void rep_hist_note_bytes_read(size_t num_bytes, time_t when); -void rep_hist_note_bytes_written(size_t num_bytes, time_t when); +void rep_hist_note_bytes_read(uint64_t num_bytes, time_t when); +void rep_hist_note_bytes_written(uint64_t num_bytes, time_t when); void rep_hist_make_router_pessimal(const char *id, time_t when); -void rep_hist_note_dir_bytes_read(size_t num_bytes, time_t when); -void rep_hist_note_dir_bytes_written(size_t num_bytes, time_t when); +void rep_hist_note_dir_bytes_read(uint64_t num_bytes, time_t when); +void rep_hist_note_dir_bytes_written(uint64_t num_bytes, time_t when); int rep_hist_bandwidth_assess(void); char *rep_hist_get_bandwidth_lines(void); |