upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make adjtime(2) adjust boottime so it doesn't cause non-monotonous

Browse source 
uptime.
This commit is contained in:
Poul-Henning Kamp 1999-12-08 10:02:12 +00:00
parent e8452d59e3
commit 2ac0d0a1f7
2 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
sys/kern/kern_clock.c
View file

@ -758,6 +758,7 @@ static void
tco_forward(int force)
{
struct timecounter *tc, *tco;
struct timeval tvt;
tco = timecounter;
tc = sync_other_counter();
@ -773,9 +774,17 @@ tco_forward(int force)
if (tco->tc_poll_pps)
tco->tc_poll_pps(tco);
if (timedelta != 0) {
tc->tc_offset_nano += (u_int64_t)(tickdelta * 1000) << 32;
tvt = boottime;
tvt.tv_usec -= tickdelta;
if (tvt.tv_usec >= 1000000) {
tvt.tv_sec++;
tvt.tv_usec -= 1000000;
} else if (tvt.tv_usec < 0) {
tvt.tv_sec--;
tvt.tv_usec += 1000000;
}
boottime = tvt;
timedelta -= tickdelta;
force++;
}
while (tc->tc_offset_nano >= 1000000000ULL << 32) {

13
sys/kern/kern_tc.c
View file

@ -758,6 +758,7 @@ static void
tco_forward(int force)
{
struct timecounter *tc, *tco;
struct timeval tvt;
tco = timecounter;
tc = sync_other_counter();
@ -773,9 +774,17 @@ tco_forward(int force)
if (tco->tc_poll_pps)
tco->tc_poll_pps(tco);
if (timedelta != 0) {
tc->tc_offset_nano += (u_int64_t)(tickdelta * 1000) << 32;
tvt = boottime;
tvt.tv_usec -= tickdelta;
if (tvt.tv_usec >= 1000000) {
tvt.tv_sec++;
tvt.tv_usec -= 1000000;
} else if (tvt.tv_usec < 0) {
tvt.tv_sec--;
tvt.tv_usec += 1000000;
}
boottime = tvt;
timedelta -= tickdelta;
force++;
}
while (tc->tc_offset_nano >= 1000000000ULL << 32) {