nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 13:53:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'dgoulet/bug25113_029_01'

Browse Source
This commit is contained in:
Nick Mathewson 2018-02-07 11:33:14 -05:00
commit 78382d557a
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/bug25113 Normal file
View File

@ -0,0 +1,5 @@
o Minor bugfixes (unit test, monotonic time):
- Bump a gap of 1msec to 10msec used in the monotonic time test that makes
sure the nsec/usec/msec time read are synchronized. This change was
needed to accommodate slow system like armel or when the clock_gettime()
is not a VDSO on the running kernel. Fixes bug 25113; bugfix on 0.2.9.1.

8
src/test/test_util.c
View File

@ -5838,10 +5838,10 @@ test_util_monotonic_time(void *arg)
tt_u64_op(usec1, OP_GE, nsec1 / 1000);
tt_u64_op(msecc1, OP_GE, nsecc1 / 1000000);
tt_u64_op(usecc1, OP_GE, nsecc1 / 1000);
tt_u64_op(msec1, OP_LE, nsec1 / 1000000 + 1);
tt_u64_op(usec1, OP_LE, nsec1 / 1000 + 1000);
tt_u64_op(msecc1, OP_LE, nsecc1 / 1000000 + 1);
tt_u64_op(usecc1, OP_LE, nsecc1 / 1000 + 1000);
tt_u64_op(msec1, OP_LE, nsec1 / 1000000 + 10);
tt_u64_op(usec1, OP_LE, nsec1 / 1000 + 10000);
tt_u64_op(msecc1, OP_LE, nsecc1 / 1000000 + 10);
tt_u64_op(usecc1, OP_LE, nsecc1 / 1000 + 10000);
uint64_t coarse_stamp_diff =
monotime_coarse_stamp_units_to_approx_msec(stamp2-stamp1);