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

Reset adjtime offset on start

Browse source
This commit is contained in:
Miroslav Lichvar 2010-08-05 13:27:52 +02:00
parent 6dcf3238f6
commit 7994b31de4
1 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
sys_linux.c
View file

@ -678,13 +678,10 @@ get_offset_correction(struct timeval *raw,
if (!slow_slewing) { if (!slow_slewing) {
offset = 0; offset = 0;
} else { } else {
again:
switch (have_readonly_adjtime) { switch (have_readonly_adjtime) {
case 2: case 2:
if (TMX_GetOffsetLeft(&offset) < 0) { if (TMX_GetOffsetLeft(&offset) < 0) {
LOG(LOGS_INFO, LOGF_SysLinux, "adjtimex() doesn't support ADJ_OFFSET_SS_READ"); CROAK("adjtimex() failed in get_offset_correction");
have_readonly_adjtime = 0;
goto again;
} }
break; break;
case 0: case 0:
@ -933,18 +930,18 @@ get_version_specific_details(void)
have_readonly_adjtime = 0; have_readonly_adjtime = 0;
break; break;
} }
/* Let's be optimistic that these will be the same until proven if (patch < 33) {
otherwise :-) */
case 7:
case 8:
/* These don't need scaling */
freq_scale = 1.0;
have_readonly_adjtime = 2;
if (minor == 6 && patch < 33) {
/* Tickless kernels before 2.6.33 accumulated ticks only in /* Tickless kernels before 2.6.33 accumulated ticks only in
half-second intervals. */ half-second intervals. */
tick_update_hz = 2; tick_update_hz = 2;
} }
/* Let's be optimistic that these will be the same until proven
otherwise :-) */
case 7:
case 8:
/* These don't seem to need scaling */
freq_scale = 1.0;
have_readonly_adjtime = 2;
break; break;
default: default:
LOG_FATAL(LOGF_SysLinux, "Kernel version not supported yet, sorry."); LOG_FATAL(LOGF_SysLinux, "Kernel version not supported yet, sorry.");
@ -971,6 +968,8 @@ get_version_specific_details(void)
void void
SYS_Linux_Initialise(void) SYS_Linux_Initialise(void)
{ {
long offset;
offset_register = 0.0; offset_register = 0.0;
fast_slewing = 0; fast_slewing = 0;
@ -983,6 +982,16 @@ SYS_Linux_Initialise(void)
accrue_offset, apply_step_offset, accrue_offset, apply_step_offset,
get_offset_correction, set_leap); get_offset_correction, set_leap);
offset = 0;
if (TMX_ApplyOffset(&offset) < 0) {
CROAK("adjtimex() failed in initialise");
}
if (have_readonly_adjtime == 2 && (TMX_GetOffsetLeft(&offset) < 0 || offset)) {
LOG(LOGS_INFO, LOGF_SysLinux, "adjtimex() doesn't support ADJ_OFFSET_SS_READ");
have_readonly_adjtime = 0;
}
TMX_SetSync(CNF_GetRTCSync()); TMX_SetSync(CNF_GetRTCSync());
} }