rtems/rtems-libbsd
1
0
Fork 0
mirror of https://git.rtems.org/rtems-libbsd/ synced 2025-10-14 05:11:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

SLEEPQUEUE(9): Fix timeout handling

Browse Source
This commit is contained in:
Sebastian Huber
2019-07-05 10:18:42 +02:00
parent 4ed60d9076
commit 313e1d5f1c
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
freebsd/sys/kern/subr_sleepqueue.c
View File

@@ -462,6 +462,7 @@ sleepq_set_timeout_sbt(void *wchan, sbintime_t sbt, sbintime_t pr,
ISR_lock_Context lock_context;
ISR_lock_Context lock_context_2;
Watchdog_Header *header;
sbintime_t sbt_per_tick;
uint64_t expire;
cpu_self = _Thread_Dispatch_disable();
@@ -477,15 +478,16 @@ sleepq_set_timeout_sbt(void *wchan, sbintime_t sbt, sbintime_t pr,
_Watchdog_Set_CPU(&executing->Timer.Watchdog, cpu_self);
_Watchdog_Per_CPU_acquire_critical(cpu_self, &lock_context_2);
sbt_per_tick = rtems_bsd_sbt_per_watchdog_tick;
if ((flags & C_ABSOLUTE) != 0) {
/*
* The FreeBSD uptime starts at one second, however, the
* relative watchdog ticks start at zero, see also TIMESEL().
*/
expire = (sbt - SBT_1S + tick_sbt - 1) / tick_sbt;
expire = (sbt - SBT_1S + sbt_per_tick - 1) / sbt_per_tick;
} else {
expire = (sbt + tick_sbt - 1) / tick_sbt;
expire = (sbt + sbt_per_tick - 1) / sbt_per_tick;
expire += cpu_self->Watchdog.ticks;
}