Commit a406255c authored by Nick Mathewson's avatar Nick Mathewson 🐚
Browse files

Merge branch 'bug23512-v4-029-fixes'

parents 4e202815 72e30f26

src/feature/stats/rephist.c

+2 −2
Original line number Diff line number Diff line
@@ -998,7 +998,7 @@ rep_hist_load_mtbf_data(time_t now) 
/** Structure to track bandwidth use, and remember the maxima for a given

 * time period.

 */

typedef struct bw_array_t {

struct bw_array_t {

  /** Observation array: Total number of bytes transferred in each of the last

   * NUM_SECS_ROLLING_MEASURE seconds. This is used as a circular array. */

  uint64_t obs[NUM_SECS_ROLLING_MEASURE];
@@ -1025,7 +1025,7 @@ typedef struct bw_array_t { 
  /** Circular array of the total bandwidth usage for the last NUM_TOTALS

   * periods */

  uint64_t totals[NUM_TOTALS];

} bw_array_t;

};



/** Shift the current period of b forward by one. */

STATIC void

src/test/test_relay.c

+2 −2
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ test_relay_close_circuit(void *arg) 
  tt_int_op(new_count, OP_EQ, old_count + 1);



  /* Ensure our write totals are 0 */

  tt_int_op(find_largest_max(write_array), OP_EQ, 0);

  tt_u64_op(find_largest_max(write_array), OP_EQ, 0);



  /* Mark the circuit for close */

  circuit_mark_for_close(TO_CIRCUIT(orcirc), 0);
@@ -122,7 +122,7 @@ test_relay_close_circuit(void *arg) 
  advance_obs(write_array);

  commit_max(write_array);

  /* Check for two cells plus overhead */

  tt_int_op(find_largest_max(write_array), OP_EQ,

  tt_u64_op(find_largest_max(write_array), OP_EQ,

                             2*(get_cell_network_size(nchan->wide_circ_ids)

                                +TLS_PER_CELL_OVERHEAD));