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 circuitmux ewma timing test more tolerant on 32bit osx

Browse Source 
Since we use a 32-bit approximation for millisecond conversion here,
we can't expect so much precision.

Fixes part of bug 27139; bugfix on 0.3.4.1-alpha.
This commit is contained in:
Nick Mathewson
2018-09-14 08:40:10 -04:00
parent f02e8b5944
commit 6e5e1be737
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/compat_time.h
+1
View File
@@ -196,6 +196,7 @@ monotime_coarse_diff_msec32(const monotime_coarse_t *start,
// on a 64-bit platform, let's assume 64/64 division is cheap.
return (int32_t) monotime_coarse_diff_msec(start, end);
#else
#define USING_32BIT_MSEC_HACK
return monotime_coarse_diff_msec32_(start, end);
#endif
}
src/test/test_circuitmux.c
+9 -4
View File
@@ -13,6 +13,8 @@
#include "scheduler.h"
#include "test.h"
#include <math.h>
/* XXXX duplicated function from test_circuitlist.c */
static channel_t *
new_fake_channel(void)
@@ -103,16 +105,19 @@ test_cmux_compute_ticks(void *arg)
monotime_coarse_set_mock_time_nsec(now);
tick = cell_ewma_get_current_tick_and_fraction(&rem);
tt_uint_op(tick, OP_EQ, tick_zero);
tt_double_op(rem, OP_GT, .149999999);
tt_double_op(rem, OP_LT, .150000001);
#ifdef USING_32BIT_MSEC_HACK
const double tolerance = .0005;
#else
const double tolerance = .00000001;
#endif
tt_double_op(fabs(rem - .15), OP_LT, tolerance);
/* 25 second later and we should be in another tick. */
now = START_NS + NS_PER_S * 25;
monotime_coarse_set_mock_time_nsec(now);
tick = cell_ewma_get_current_tick_and_fraction(&rem);
tt_uint_op(tick, OP_EQ, tick_zero + 2);
tt_double_op(rem, OP_GT, .499999999);
tt_double_op(rem, OP_LT, .500000001);
tt_double_op(fabs(rem - .5), OP_LT, tolerance);
done:
;