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

Demote a log message due to libevent delays.

Browse Source 
This is a side-effect of being single-threaded. The worst cases of this are
actually Bug #16585.
This commit is contained in:
Mike Perry 2017-06-21 16:30:53 -04:00 committed by Nick Mathewson
parent 784b29a2bf
commit 0592ee45fc
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/or/channelpadding.c
View File

@ -530,10 +530,20 @@ channelpadding_compute_time_until_pad_for_netflow(channel_t *chan)
>= chan->next_padding_time_ms) { >= chan->next_padding_time_ms) {
int64_t ms_until_pad_for_netflow = chan->next_padding_time_ms - int64_t ms_until_pad_for_netflow = chan->next_padding_time_ms -
long_now; long_now;
/* If the padding time is in the past, that means that libevent delayed
* calling the once-per-second callback due to other work taking too long.
* See https://bugs.torproject.org/22212 and
* https://bugs.torproject.org/16585. This is a systemic problem
* with being single-threaded, but let's emit a notice if this
* is long enough in the past that we might have missed a netflow window,
* and allowed a router to emit a netflow frame, just so we don't forget
* about it entirely.. */
#define NETFLOW_MISSED_WINDOW (150000 - DFLT_NETFLOW_INACTIVE_KEEPALIVE_HIGH)
if (ms_until_pad_for_netflow < 0) { if (ms_until_pad_for_netflow < 0) {
log_warn(LD_BUG, int severity = (ms_until_pad_for_netflow < -NETFLOW_MISSED_WINDOW)
"Channel padding timeout scheduled "I64_FORMAT"ms in the past. " ? LOG_NOTICE : LOG_INFO;
"Did the monotonic clock just jump?", log_fn(severity, LD_OR,
"Channel padding timeout scheduled "I64_FORMAT"ms in the past. ",
I64_PRINTF_ARG(-ms_until_pad_for_netflow)); I64_PRINTF_ARG(-ms_until_pad_for_netflow));
return 0; /* Clock jumped: Send padding now */ return 0; /* Clock jumped: Send padding now */
} }

2
src/test/test_channelpadding.c
View File

@ -795,8 +795,6 @@ test_channelpadding_decide_to_pad_channel(void *arg)
tried_to_write_cell = 0; tried_to_write_cell = 0;
chan->next_padding_time_ms = monotime_coarse_absolute_msec() - 100; chan->next_padding_time_ms = monotime_coarse_absolute_msec() - 100;
decision = channelpadding_decide_to_pad_channel(chan); decision = channelpadding_decide_to_pad_channel(chan);
expect_log_msg("Channel padding timeout scheduled 100ms in the past. "
"Did the monotonic clock just jump?\n");
tt_int_op(decision, OP_EQ, CHANNELPADDING_PADDING_SENT); tt_int_op(decision, OP_EQ, CHANNELPADDING_PADDING_SENT);
tt_int_op(tried_to_write_cell, OP_EQ, 1); tt_int_op(tried_to_write_cell, OP_EQ, 1);
tt_assert(!chan->pending_padding_callback); tt_assert(!chan->pending_padding_callback);