mirror of
https://github.com/RGBCube/serenity
synced 2025-07-25 04:57:44 +00:00
Kernel: Move some time related code from Scheduler into TimeManagement
Use the TimerQueue to expire blocking operations, which is one less thing the Scheduler needs to check on every iteration. Also, add a BlockTimeout class that will automatically handle relative or absolute timeouts as well as overriding timeouts (e.g. socket timeouts) more consistently. Also, rework the TimerQueue class to be able to fire events from any processor, which requires Timer to be RefCounted. Also allow creating id-less timers for use by blocking operations.
This commit is contained in:
parent
e0e26c6c67
commit
6cb640eeba
19 changed files with 461 additions and 263 deletions
|
@ -37,13 +37,9 @@ int Process::sys$clock_gettime(clockid_t clock_id, Userspace<timespec*> user_ts)
|
|||
timespec ts = {};
|
||||
|
||||
switch (clock_id) {
|
||||
case CLOCK_MONOTONIC: {
|
||||
auto ticks_per_second = TimeManagement::the().ticks_per_second();
|
||||
auto uptime = g_uptime;
|
||||
ts.tv_sec = uptime / ticks_per_second;
|
||||
ts.tv_nsec = (1000000000 * (uptime % ticks_per_second)) / ticks_per_second;
|
||||
case CLOCK_MONOTONIC:
|
||||
ts = TimeManagement::the().monotonic_time();
|
||||
break;
|
||||
}
|
||||
case CLOCK_REALTIME:
|
||||
ts = TimeManagement::the().epoch_time();
|
||||
break;
|
||||
|
@ -91,29 +87,19 @@ int Process::sys$clock_nanosleep(Userspace<const Syscall::SC_clock_nanosleep_par
|
|||
|
||||
bool is_absolute = params.flags & TIMER_ABSTIME;
|
||||
|
||||
auto ticks_per_second = TimeManagement::the().ticks_per_second();
|
||||
|
||||
switch (params.clock_id) {
|
||||
case CLOCK_MONOTONIC: {
|
||||
u64 ticks_to_sleep = requested_sleep.tv_sec * ticks_per_second;
|
||||
ticks_to_sleep += (requested_sleep.tv_nsec * ticks_per_second) / 1000000000;
|
||||
if (is_absolute)
|
||||
ticks_to_sleep -= g_uptime;
|
||||
if (!ticks_to_sleep)
|
||||
return 0;
|
||||
u64 wakeup_time = Thread::current()->sleep(ticks_to_sleep);
|
||||
if (wakeup_time > g_uptime) {
|
||||
u64 ticks_left = wakeup_time - g_uptime;
|
||||
if (!is_absolute && params.remaining_sleep) {
|
||||
timespec remaining_sleep = {};
|
||||
remaining_sleep.tv_sec = ticks_left / ticks_per_second;
|
||||
ticks_left -= remaining_sleep.tv_sec * ticks_per_second;
|
||||
remaining_sleep.tv_nsec = (ticks_left * 1000000000) / ticks_per_second;
|
||||
if (!copy_to_user(params.remaining_sleep, &remaining_sleep))
|
||||
return -EFAULT;
|
||||
}
|
||||
return -EINTR;
|
||||
bool was_interrupted;
|
||||
if (is_absolute) {
|
||||
was_interrupted = Thread::current()->sleep_until(requested_sleep).was_interrupted();
|
||||
} else {
|
||||
timespec remaining_sleep;
|
||||
was_interrupted = Thread::current()->sleep(requested_sleep, &remaining_sleep).was_interrupted();
|
||||
if (was_interrupted && params.remaining_sleep && !copy_to_user(params.remaining_sleep, &remaining_sleep))
|
||||
return -EFAULT;
|
||||
}
|
||||
if (was_interrupted)
|
||||
return -EINTR;
|
||||
return 0;
|
||||
}
|
||||
default:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue