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

Don't apply outlyer penalty at beginning

Browse source 
Wait until the reach register is full to allow marking a source as
outlyer for 32 updates. This makes start nicer with iburst.
This commit is contained in:
Miroslav Lichvar 2013-06-13 18:19:17 +02:00
parent 6d2fb9f782
commit 1ad22e9a02
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
sources.c
View file

@ -93,6 +93,9 @@ struct SRC_Instance_Record {
/* Reachability register */ /* Reachability register */
int reachability; int reachability;
/* Flag indicating that only few samples were accumulated so far */
int beginning;
/* Updates left before resetting outlyer status */ /* Updates left before resetting outlyer status */
int outlyer; int outlyer;
@ -216,6 +219,7 @@ SRC_Instance SRC_CreateNewInstance(uint32_t ref_id, SRC_Type type, SRC_SelectOpt
result->ip_addr = addr; result->ip_addr = addr;
result->selectable = 0; result->selectable = 0;
result->reachability = 0; result->reachability = 0;
result->beginning = 1;
result->outlyer = 0; result->outlyer = 0;
result->status = SRC_BAD_STATS; result->status = SRC_BAD_STATS;
result->type = type; result->type = type;
@ -360,6 +364,10 @@ SRC_UpdateReachability(SRC_Instance inst, int reachable)
inst->reachability |= !!reachable; inst->reachability |= !!reachable;
inst->reachability &= ~(-1 << REACH_BITS); inst->reachability &= ~(-1 << REACH_BITS);
/* The beginning is over when the first sample is at the end of the register */
if (inst->reachability & (1 << (REACH_BITS - 1)))
inst->beginning = 0;
if (!reachable && inst->index == selected_source_index) { if (!reachable && inst->index == selected_source_index) {
/* Try to select a better source */ /* Try to select a better source */
SRC_SelectSource(0); SRC_SelectSource(0);
@ -446,7 +454,7 @@ combine_sources(int n_sel_sources, struct timeval *ref_time, double *offset,
(reselect_distance + sources[selected_source_index]->sel_info.root_distance) || (reselect_distance + sources[selected_source_index]->sel_info.root_distance) ||
fabs(*frequency - src_frequency) > fabs(*frequency - src_frequency) >
combine_limit * (*skew + src_skew + LCL_GetMaxClockError()))) { combine_limit * (*skew + src_skew + LCL_GetMaxClockError()))) {
sources[index]->outlyer = OUTLYER_PENALTY; sources[index]->outlyer = !sources[index]->beginning ? OUTLYER_PENALTY : 1;
} }
if (sources[index]->outlyer) { if (sources[index]->outlyer) {