RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 13:28:11 +00:00
Code Issues Activity Actions

Kernel: Stop using *LockRefPtr for Kernel::Timer

Browse source
This commit is contained in:
Andreas Kling 2023-04-03 13:09:38 +02:00
parent 83b409083b
commit 496d918e92
9 changed files with 42 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

46
Kernel/Syscalls/alarm.cpp
View file

@ -15,31 +15,33 @@ ErrorOr<FlatPtr> Process::sys$alarm(unsigned seconds)
VERIFY_PROCESS_BIG_LOCK_ACQUIRED(this);
TRY(require_promise(Pledge::stdio));
unsigned previous_alarm_remaining = 0;
if (m_alarm_timer) {
bool was_in_use = false;
if (TimerQueue::the().cancel_timer(*m_alarm_timer, &was_in_use)) {
// The timer hasn't fired. Round up the remaining time (if any)
Time remaining = m_alarm_timer->remaining() + Time::from_nanoseconds(999'999'999);
previous_alarm_remaining = remaining.to_truncated_seconds();
return m_alarm_timer.with([&](auto& timer) -> ErrorOr<FlatPtr> {
if (timer) {
bool was_in_use = false;
if (TimerQueue::the().cancel_timer(*timer, &was_in_use)) {
// The timer hasn't fired. Round up the remaining time (if any)
Time remaining = timer->remaining() + Time::from_nanoseconds(999'999'999);
previous_alarm_remaining = remaining.to_truncated_seconds();
}
// We had an existing alarm, must return a non-zero value here!
if (was_in_use && previous_alarm_remaining == 0)
previous_alarm_remaining = 1;
}
// We had an existing alarm, must return a non-zero value here!
if (was_in_use && previous_alarm_remaining == 0)
previous_alarm_remaining = 1;
}
if (seconds > 0) {
auto deadline = TimeManagement::the().current_time(CLOCK_REALTIME_COARSE);
deadline = deadline + Time::from_seconds(seconds);
if (!m_alarm_timer) {
m_alarm_timer = TRY(adopt_nonnull_lock_ref_or_enomem(new (nothrow) Timer));
if (seconds > 0) {
auto deadline = TimeManagement::the().current_time(CLOCK_REALTIME_COARSE);
deadline = deadline + Time::from_seconds(seconds);
if (!timer) {
timer = TRY(adopt_nonnull_ref_or_enomem(new (nothrow) Timer));
}
auto timer_was_added = TimerQueue::the().add_timer_without_id(*timer, CLOCK_REALTIME_COARSE, deadline, [this]() {
MUST(send_signal(SIGALRM, nullptr));
});
if (!timer_was_added)
return ENOMEM;
}
auto timer_was_added = TimerQueue::the().add_timer_without_id(*m_alarm_timer, CLOCK_REALTIME_COARSE, deadline, [this]() {
MUST(send_signal(SIGALRM, nullptr));
});
if (!timer_was_added)
return ENOMEM;
}
return previous_alarm_remaining;
return previous_alarm_remaining;
});
}
}