Commit 7dc435e6 authored by Mike Perry's avatar Mike Perry
Browse files

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.
parent c02f2d9e

src/or/rephist.c

+4 −4
Original line number Diff line number Diff line
@@ -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);

}

src/or/rephist.h

+4 −4
Original line number Diff line number Diff line
@@ -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);