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

refclock: fix sample validation with sub-second poll

Browse source
This commit is contained in:
Miroslav Lichvar 2014-05-22 15:14:12 +02:00
parent ee53d816ce
commit 98bbfdf73c
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
refclock.c
View file

@ -476,6 +476,15 @@ RCL_AddPulse(RCL_Instance instance, struct timeval *pulse_time, double second)
return 1; return 1;
} }
static double
poll_interval(int poll)
{
if (poll >= 0)
return 1 << poll;
else
return 1.0 / (1 << -poll);
}
static int static int
valid_sample_time(RCL_Instance instance, struct timeval *tv) valid_sample_time(RCL_Instance instance, struct timeval *tv)
{ {
@ -484,8 +493,8 @@ valid_sample_time(RCL_Instance instance, struct timeval *tv)
LCL_ReadRawTime(&raw_time); LCL_ReadRawTime(&raw_time);
UTI_DiffTimevalsToDouble(&diff, &raw_time, tv); UTI_DiffTimevalsToDouble(&diff, &raw_time, tv);
if (diff < 0.0 || diff > 1 << (instance->poll + 1)) { if (diff < 0.0 || diff > poll_interval(instance->poll + 1)) {
DEBUG_LOG(LOGF_Refclock, "refclock sample not valid age=%.f tv=%s", DEBUG_LOG(LOGF_Refclock, "refclock sample not valid age=%.6f tv=%s",
diff, UTI_TimevalToString(tv)); diff, UTI_TimevalToString(tv));
return 0; return 0;
} }
@ -522,7 +531,6 @@ pps_stratum(RCL_Instance instance, struct timeval *tv)
static void static void
poll_timeout(void *arg) poll_timeout(void *arg)
{ {
double next;
int poll; int poll;
RCL_Instance inst = (RCL_Instance)arg; RCL_Instance inst = (RCL_Instance)arg;
@ -561,12 +569,7 @@ poll_timeout(void *arg)
} }
} }
if (poll >= 0) inst->timeout_id = SCH_AddTimeoutByDelay(poll_interval(poll), poll_timeout, arg);
next = 1 << poll;
else
next = 1.0 / (1 << -poll);
inst->timeout_id = SCH_AddTimeoutByDelay(next, poll_timeout, arg);
} }
static void static void