torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make monotime test mocking work with oom tests.

Browse Source
This commit is contained in:
Nick Mathewson
2016-07-21 12:36:13 +02:00
parent 50463524a9
commit 61ce6dcb40
2 changed files with 49 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/or/relay.c
+2 -3
View File
@@ -2626,9 +2626,8 @@ channel_flush_from_first_active_circuit, (channel_t *chan, int max))
if (get_options()->CellStatistics ||
get_options()->TestingEnableCellStatsEvent) {
uint32_t msec_waiting;
struct timeval tvnow;
tor_gettimeofday_cached(&tvnow);
msec_waiting = ((uint32_t)tv_to_msec(&tvnow)) - cell->inserted_time;
uint32_t msec_now = (uint32_t)monotime_coarse_absolute_msec();
msec_waiting = msec_now - cell->inserted_time;
if (get_options()->CellStatistics && !CIRCUIT_IS_ORIGIN(circ)) {
or_circ = TO_OR_CIRCUIT(circ);