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

ntp: include local error in hwclock samples

Browse source
This commit is contained in:
Miroslav Lichvar 2017-05-09 17:43:33 +02:00
parent e8b06fef9f
commit 54a12779e2
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ntp_io_linux.c
View file

@ -373,16 +373,18 @@ process_hw_timestamp(struct Interface *iface, struct timespec *hw_ts,
NTP_Local_Timestamp *local_ts, int rx_ntp_length, int family) NTP_Local_Timestamp *local_ts, int rx_ntp_length, int family)
{ {
struct timespec sample_phc_ts, sample_sys_ts, sample_local_ts, ts; struct timespec sample_phc_ts, sample_sys_ts, sample_local_ts, ts;
double rx_correction, ts_delay, err; double rx_correction, ts_delay, phc_err, local_err;
int l2_length; int l2_length;
if (HCL_NeedsNewSample(iface->clock, &local_ts->ts)) { if (HCL_NeedsNewSample(iface->clock, &local_ts->ts)) {
if (!SYS_Linux_GetPHCSample(iface->phc_fd, iface->phc_nocrossts, iface->precision, if (!SYS_Linux_GetPHCSample(iface->phc_fd, iface->phc_nocrossts, iface->precision,
&iface->phc_mode, &sample_phc_ts, &sample_sys_ts, &err)) &iface->phc_mode, &sample_phc_ts, &sample_sys_ts,
&phc_err))
return; return;
LCL_CookTime(&sample_sys_ts, &sample_local_ts, NULL); LCL_CookTime(&sample_sys_ts, &sample_local_ts, &local_err);
HCL_AccumulateSample(iface->clock, &sample_phc_ts, &sample_local_ts, err); HCL_AccumulateSample(iface->clock, &sample_phc_ts, &sample_local_ts,
phc_err + local_err);
update_interface_speed(iface); update_interface_speed(iface);
} }
@ -405,7 +407,7 @@ process_hw_timestamp(struct Interface *iface, struct timespec *hw_ts,
else if (rx_ntp_length && iface->rx_comp) else if (rx_ntp_length && iface->rx_comp)
UTI_AddDoubleToTimespec(hw_ts, -iface->rx_comp, hw_ts); UTI_AddDoubleToTimespec(hw_ts, -iface->rx_comp, hw_ts);
if (!HCL_CookTime(iface->clock, hw_ts, &ts, &err)) if (!HCL_CookTime(iface->clock, hw_ts, &ts, &local_err))
return; return;
ts_delay = UTI_DiffTimespecsToDouble(&local_ts->ts, &ts); ts_delay = UTI_DiffTimespecsToDouble(&local_ts->ts, &ts);
@ -416,7 +418,7 @@ process_hw_timestamp(struct Interface *iface, struct timespec *hw_ts,
} }
local_ts->ts = ts; local_ts->ts = ts;
local_ts->err = err; local_ts->err = local_err;
local_ts->source = NTP_TS_HARDWARE; local_ts->source = NTP_TS_HARDWARE;
} }