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

refclock: don't require raw time in valid_sample_time()

Browse source 
This makes the check a bit more expensive, but it will be needed to
allow refclocks that don't have raw system time.
This commit is contained in:
Miroslav Lichvar 2017-05-10 16:14:03 +02:00
parent 54a12779e2
commit 1bf2384a1f
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
refclock.c
View file

@ -93,7 +93,7 @@ static ARR_Instance refclocks;
static LOG_FileID logfileid; static LOG_FileID logfileid;
static int valid_sample_time(RCL_Instance instance, struct timespec *raw, struct timespec *cooked); static int valid_sample_time(RCL_Instance instance, struct timespec *sample_time);
static int pps_stratum(RCL_Instance instance, struct timespec *ts); static int pps_stratum(RCL_Instance instance, struct timespec *ts);
static void poll_timeout(void *arg); static void poll_timeout(void *arg);
static void slew_samples(struct timespec *raw, struct timespec *cooked, double dfreq, static void slew_samples(struct timespec *raw, struct timespec *cooked, double dfreq,
@ -375,7 +375,7 @@ RCL_AddSample(RCL_Instance instance, struct timespec *sample_time, double offset
/* Make sure the timestamp and offset provided by the driver are sane */ /* Make sure the timestamp and offset provided by the driver are sane */
if (!UTI_IsTimeOffsetSane(sample_time, offset) || if (!UTI_IsTimeOffsetSane(sample_time, offset) ||
!valid_sample_time(instance, sample_time, &cooked_time)) !valid_sample_time(instance, &cooked_time))
return 0; return 0;
switch (leap) { switch (leap) {
@ -415,7 +415,7 @@ RCL_AddPulse(RCL_Instance instance, struct timespec *pulse_time, double second)
dispersion += instance->precision; dispersion += instance->precision;
if (!UTI_IsTimeOffsetSane(pulse_time, 0.0) || if (!UTI_IsTimeOffsetSane(pulse_time, 0.0) ||
!valid_sample_time(instance, pulse_time, &cooked_time)) !valid_sample_time(instance, &cooked_time))
return 0; return 0;
rate = instance->pps_rate; rate = instance->pps_rate;
@ -512,22 +512,22 @@ RCL_GetPrecision(RCL_Instance instance)
} }
static int static int
valid_sample_time(RCL_Instance instance, struct timespec *raw, struct timespec *cooked) valid_sample_time(RCL_Instance instance, struct timespec *sample_time)
{ {
struct timespec now_raw, last_sample_time; struct timespec now, last_sample_time;
double diff, last_offset, last_dispersion; double diff, last_offset, last_dispersion;
LCL_ReadRawTime(&now_raw); LCL_ReadCookedTime(&now, NULL);
diff = UTI_DiffTimespecsToDouble(&now_raw, raw); diff = UTI_DiffTimespecsToDouble(&now, sample_time);
if (diff < 0.0 || diff > UTI_Log2ToDouble(instance->poll + 1) || if (diff < 0.0 || diff > UTI_Log2ToDouble(instance->poll + 1) ||
(filter_get_samples(&instance->filter) > 0 && (filter_get_samples(&instance->filter) > 0 &&
filter_get_last_sample(&instance->filter, &last_sample_time, filter_get_last_sample(&instance->filter, &last_sample_time,
&last_offset, &last_dispersion) && &last_offset, &last_dispersion) &&
UTI_CompareTimespecs(&last_sample_time, cooked) >= 0)) { UTI_CompareTimespecs(&last_sample_time, sample_time) >= 0)) {
DEBUG_LOG("%s refclock sample not valid age=%.6f raw=%s cooked=%s", DEBUG_LOG("%s refclock sample time %s not valid age=%.6f",
UTI_RefidToString(instance->ref_id), diff, UTI_RefidToString(instance->ref_id),
UTI_TimespecToString(raw), UTI_TimespecToString(cooked)); UTI_TimespecToString(sample_time), diff);
return 0; return 0;
} }