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

ntp: don't reset polling interval when switching to/from online

Browse source 
This allows chronyd to ramp up the polling interval even when the source
is frequently switched between the online and offline modes.
This commit is contained in:
Miroslav Lichvar 2016-11-23 12:45:11 +01:00
parent 3a67dedad6
commit 4d7eb2f7a6
3 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ntp_core.c
View file

@ -553,6 +553,7 @@ NCR_GetInstance(NTP_Remote_Address *remote_addr, NTP_Source_Type type, SourcePar
result->tx_suspended = 1; result->tx_suspended = 1;
result->opmode = params->online ? MD_ONLINE : MD_OFFLINE; result->opmode = params->online ? MD_ONLINE : MD_OFFLINE;
result->local_poll = result->minpoll; result->local_poll = result->minpoll;
result->poll_score = 0.0;
UTI_ZeroTimespec(&result->local_tx.ts); UTI_ZeroTimespec(&result->local_tx.ts);
result->local_tx.err = 0.0; result->local_tx.err = 0.0;
result->local_tx.source = NTP_TS_DAEMON; result->local_tx.source = NTP_TS_DAEMON;
@ -605,7 +606,6 @@ NCR_ResetInstance(NCR_Instance instance)
instance->tx_count = 0; instance->tx_count = 0;
instance->presend_done = 0; instance->presend_done = 0;
instance->poll_score = 0.0;
instance->remote_poll = 0; instance->remote_poll = 0;
instance->remote_stratum = 0; instance->remote_stratum = 0;
@ -619,7 +619,13 @@ NCR_ResetInstance(NCR_Instance instance)
UTI_ZeroTimespec(&instance->local_rx.ts); UTI_ZeroTimespec(&instance->local_rx.ts);
instance->local_rx.err = 0.0; instance->local_rx.err = 0.0;
instance->local_rx.source = NTP_TS_DAEMON; instance->local_rx.source = NTP_TS_DAEMON;
}
/* ================================================== */
void
NCR_ResetPoll(NCR_Instance instance)
{
if (instance->local_poll != instance->minpoll) { if (instance->local_poll != instance->minpoll) {
instance->local_poll = instance->minpoll; instance->local_poll = instance->minpoll;
@ -634,9 +640,8 @@ NCR_ResetInstance(NCR_Instance instance)
void void
NCR_ChangeRemoteAddress(NCR_Instance inst, NTP_Remote_Address *remote_addr) NCR_ChangeRemoteAddress(NCR_Instance inst, NTP_Remote_Address *remote_addr)
{ {
NCR_ResetInstance(inst);
inst->remote_addr = *remote_addr; inst->remote_addr = *remote_addr;
inst->tx_count = 0;
inst->presend_done = 0;
if (inst->mode == MODE_CLIENT) if (inst->mode == MODE_CLIENT)
close_client_socket(inst); close_client_socket(inst);

3
ntp_core.h
View file

@ -70,6 +70,9 @@ extern void NCR_StartInstance(NCR_Instance instance);
/* Reset an instance */ /* Reset an instance */
extern void NCR_ResetInstance(NCR_Instance inst); extern void NCR_ResetInstance(NCR_Instance inst);
/* Reset polling interval of an instance */
extern void NCR_ResetPoll(NCR_Instance instance);
/* Change the remote address of an instance */ /* Change the remote address of an instance */
extern void NCR_ChangeRemoteAddress(NCR_Instance inst, NTP_Remote_Address *remote_addr); extern void NCR_ChangeRemoteAddress(NCR_Instance inst, NTP_Remote_Address *remote_addr);

1
ntp_sources.c
View file

@ -851,6 +851,7 @@ slew_sources(struct timespec *raw,
if (record->remote_addr) { if (record->remote_addr) {
if (change_type == LCL_ChangeUnknownStep) { if (change_type == LCL_ChangeUnknownStep) {
NCR_ResetInstance(record->data); NCR_ResetInstance(record->data);
NCR_ResetPoll(record->data);
} else { } else {
NCR_SlewTimes(record->data, cooked, dfreq, doffset); NCR_SlewTimes(record->data, cooked, dfreq, doffset);
} }