faraphel/chrony
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ntp: revert reversed poll tracking in interleaved mode

Browse source 
With the new selection of timestamps in the interleaved mode it's no
longer necessary to reverse the poll tracking in order to reduce the
local and remote intervals of measurements that makes the peer with
higher stratum.

This reverts commit 4a24368763.
This commit is contained in:
Miroslav Lichvar 2017-07-21 10:55:06 +02:00
parent 0baa35eade
commit 992590e99c
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ntp_core.c
View file

@ -215,7 +215,7 @@ static ARR_Instance broadcasts;
#define SAMPLING_RANDOMNESS 0.02 #define SAMPLING_RANDOMNESS 0.02
/* Adjustment of the peer polling interval */ /* Adjustment of the peer polling interval */
#define PEER_SAMPLING_ADJ 1.15 #define PEER_SAMPLING_ADJ 1.1
/* Spacing between samples in burst mode for one server/peer */ /* Spacing between samples in burst mode for one server/peer */
#define BURST_INTERVAL 2.0 #define BURST_INTERVAL 2.0
@ -804,16 +804,13 @@ get_transmit_delay(NCR_Instance inst, int on_tx, double last_tx)
break; break;
case MODE_ACTIVE: case MODE_ACTIVE:
/* If in the basic mode the remote stratum is higher than ours, /* If the remote stratum is higher than ours, wait a bit for the next
or in the interleaved mode it is lower, wait a bit for the next
packet before responding in order to minimize the delay of the packet before responding in order to minimize the delay of the
measurement and its error for the peer which has higher stratum. measurement and its error for the peer which has higher stratum.
If the remote stratum is equal to ours, try to interleave packets If the remote stratum is equal to ours, try to interleave packets
evenly with the peer. */ evenly with the peer. */
stratum_diff = inst->remote_stratum - REF_GetOurStratum(); stratum_diff = inst->remote_stratum - REF_GetOurStratum();
if ((((stratum_diff > 0 && !inst->interleaved) || if ((stratum_diff > 0 && last_tx * PEER_SAMPLING_ADJ < delay_time) ||
(stratum_diff < 0 && inst->interleaved)) &&
last_tx * PEER_SAMPLING_ADJ < delay_time) ||
(!on_tx && !stratum_diff && (!on_tx && !stratum_diff &&
last_tx / delay_time > PEER_SAMPLING_ADJ - 0.5)) last_tx / delay_time > PEER_SAMPLING_ADJ - 0.5))
delay_time *= PEER_SAMPLING_ADJ; delay_time *= PEER_SAMPLING_ADJ;