RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-25 22:45:06 +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

8
Kernel/TimerQueue.cpp
View file

@ -55,14 +55,14 @@ UNMAP_AFTER_INIT TimerQueue::TimerQueue()
m_ticks_per_second = TimeManagement::the().ticks_per_second();
}
bool TimerQueue::add_timer_without_id(NonnullLockRefPtr<Timer> timer, clockid_t clock_id, Time const& deadline, Function<void()>&& callback)
bool TimerQueue::add_timer_without_id(NonnullRefPtr<Timer> timer, clockid_t clock_id, Time const& deadline, Function<void()>&& callback)
{
if (deadline <= TimeManagement::the().current_time(clock_id))
return false;
// Because timer handlers can execute on any processor and there is
// a race between executing a timer handler and cancel_timer() this
// *must* be a LockRefPtr<Timer>. Otherwise, calling cancel_timer() could
// *must* be a RefPtr<Timer>. Otherwise, calling cancel_timer() could
// inadvertently cancel another timer that has been created between
// returning from the timer handler and a call to cancel_timer().
timer->setup(clock_id, deadline, move(callback));
@ -73,7 +73,7 @@ bool TimerQueue::add_timer_without_id(NonnullLockRefPtr<Timer> timer, clockid_t
return true;
}
TimerId TimerQueue::add_timer(NonnullLockRefPtr<Timer>&& timer)
TimerId TimerQueue::add_timer(NonnullRefPtr<Timer>&& timer)
{
SpinlockLocker lock(g_timerqueue_lock);
@ -84,7 +84,7 @@ TimerId TimerQueue::add_timer(NonnullLockRefPtr<Timer>&& timer)
return id;
}
void TimerQueue::add_timer_locked(NonnullLockRefPtr<Timer> timer)
void TimerQueue::add_timer_locked(NonnullRefPtr<Timer> timer)
{
Time timer_expiration = timer->m_expires;