mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-24 12:23:32 +01:00
Merge branch 'bug23512-v4-029-fixes-keep-typedef' into bug23512-v4-034-fixes
This commit is contained in:
commit
e91b999cf2
@ -984,7 +984,7 @@ rep_hist_load_mtbf_data(time_t now)
|
|||||||
/** Structure to track bandwidth use, and remember the maxima for a given
|
/** Structure to track bandwidth use, and remember the maxima for a given
|
||||||
* time period.
|
* time period.
|
||||||
*/
|
*/
|
||||||
typedef struct bw_array_t {
|
struct bw_array_t {
|
||||||
/** Observation array: Total number of bytes transferred in each of the last
|
/** Observation array: Total number of bytes transferred in each of the last
|
||||||
* NUM_SECS_ROLLING_MEASURE seconds. This is used as a circular array. */
|
* NUM_SECS_ROLLING_MEASURE seconds. This is used as a circular array. */
|
||||||
uint64_t obs[NUM_SECS_ROLLING_MEASURE];
|
uint64_t obs[NUM_SECS_ROLLING_MEASURE];
|
||||||
@ -1011,7 +1011,7 @@ typedef struct bw_array_t {
|
|||||||
/** Circular array of the total bandwidth usage for the last NUM_TOTALS
|
/** Circular array of the total bandwidth usage for the last NUM_TOTALS
|
||||||
* periods */
|
* periods */
|
||||||
uint64_t totals[NUM_TOTALS];
|
uint64_t totals[NUM_TOTALS];
|
||||||
} bw_array_t;
|
};
|
||||||
|
|
||||||
/** Shift the current period of b forward by one. */
|
/** Shift the current period of b forward by one. */
|
||||||
STATIC void
|
STATIC void
|
||||||
@ -3210,4 +3210,3 @@ rep_hist_free_all(void)
|
|||||||
tor_assert_nonfatal(rephist_total_alloc == 0);
|
tor_assert_nonfatal(rephist_total_alloc == 0);
|
||||||
tor_assert_nonfatal_once(rephist_total_num == 0);
|
tor_assert_nonfatal_once(rephist_total_num == 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -110,7 +110,7 @@ test_relay_close_circuit(void *arg)
|
|||||||
tt_int_op(new_count, OP_EQ, old_count + 1);
|
tt_int_op(new_count, OP_EQ, old_count + 1);
|
||||||
|
|
||||||
/* Ensure our write totals are 0 */
|
/* 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 */
|
/* Mark the circuit for close */
|
||||||
circuit_mark_for_close(TO_CIRCUIT(orcirc), 0);
|
circuit_mark_for_close(TO_CIRCUIT(orcirc), 0);
|
||||||
@ -119,7 +119,7 @@ test_relay_close_circuit(void *arg)
|
|||||||
advance_obs(write_array);
|
advance_obs(write_array);
|
||||||
commit_max(write_array);
|
commit_max(write_array);
|
||||||
/* Check for two cells plus overhead */
|
/* 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)
|
2*(get_cell_network_size(nchan->wide_circ_ids)
|
||||||
+TLS_PER_CELL_OVERHEAD));
|
+TLS_PER_CELL_OVERHEAD));
|
||||||
|
|
||||||
@ -229,4 +229,3 @@ struct testcase_t relay_tests[] = {
|
|||||||
TT_FORK, NULL, NULL },
|
TT_FORK, NULL, NULL },
|
||||||
END_OF_TESTCASES
|
END_OF_TESTCASES
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user