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

refclock: require new samples to have newer timestamp

Browse source 
If all or most SHM/SOCK samples collected in a polling interval had the
same local timestamp, the dispersion could end up as nan, which could
trigger an assert failure later in the code.

Before accumulating a refclock sample, check if the timestamp is newer
than the previous one.
This commit is contained in:
Miroslav Lichvar 2016-10-06 15:21:43 +02:00
parent 9c48166e90
commit 8f85291d23
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
refclock.c
View file

@ -505,16 +505,22 @@ RCL_AddPulse(RCL_Instance instance, struct timespec *pulse_time, double second)
static int static int
valid_sample_time(RCL_Instance instance, struct timespec *ts) valid_sample_time(RCL_Instance instance, struct timespec *ts)
{ {
struct timespec raw_time; struct timespec raw_time, last_sample_time;
double diff; double diff, last_offset, last_dispersion;
LCL_ReadRawTime(&raw_time); LCL_ReadRawTime(&raw_time);
diff = UTI_DiffTimespecsToDouble(&raw_time, ts); diff = UTI_DiffTimespecsToDouble(&raw_time, ts);
if (diff < 0.0 || diff > UTI_Log2ToDouble(instance->poll + 1)) {
DEBUG_LOG(LOGF_Refclock, "%s refclock sample not valid age=%.6f ts=%s", if (diff < 0.0 || diff > UTI_Log2ToDouble(instance->poll + 1) ||
UTI_RefidToString(instance->ref_id), diff, UTI_TimespecToString(ts)); (filter_get_last_sample(&instance->filter, &last_sample_time,
&last_offset, &last_dispersion) &&
UTI_CompareTimespecs(&last_sample_time, ts) >= 0)) {
DEBUG_LOG(LOGF_Refclock, "%s refclock sample not valid age=%.6f ts=%s lastts=%s",
UTI_RefidToString(instance->ref_id), diff,
UTI_TimespecToString(ts), UTI_TimespecToString(&last_sample_time));
return 0; return 0;
} }
return 1; return 1;
} }