mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-06-18 16:21:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Kernel: Rename ScopedSpinlock => SpinlockLocker

Browse source 
This matches MutexLocker, and doesn't sound like it's a lock itself.
This commit is contained in:
Andreas Kling 2021-08-22 01:49:22 +02:00
parent 55adace359
commit c922a7da09
Notes: sideshowbarker 2024-07-18 05:24:51 +09:00
78 changed files with 365 additions and 366 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Kernel/TimerQueue.cpp
View file

@ -67,7 +67,7 @@ bool TimerQueue::add_timer_without_id(NonnullRefPtr<Timer> timer, clockid_t cloc
// returning from the timer handler and a call to cancel_timer().
timer->setup(clock_id, deadline, move(callback));
ScopedSpinlock lock(g_timerqueue_lock);
SpinlockLocker lock(g_timerqueue_lock);
timer->m_id = 0; // Don't generate a timer id
add_timer_locked(move(timer));
return true;
@ -75,7 +75,7 @@ bool TimerQueue::add_timer_without_id(NonnullRefPtr<Timer> timer, clockid_t cloc
TimerId TimerQueue::add_timer(NonnullRefPtr<Timer>&& timer)
{
ScopedSpinlock lock(g_timerqueue_lock);
SpinlockLocker lock(g_timerqueue_lock);
timer->m_id = ++m_timer_id_count;
VERIFY(timer->m_id != 0); // wrapped
@ -130,7 +130,7 @@ bool TimerQueue::cancel_timer(TimerId id)
Timer* found_timer = nullptr;
Queue* timer_queue = nullptr;
ScopedSpinlock lock(g_timerqueue_lock);
SpinlockLocker lock(g_timerqueue_lock);
for (auto& timer : m_timer_queue_monotonic.list) {
if (timer.m_id == id) {
found_timer = &timer;
@ -207,7 +207,7 @@ bool TimerQueue::cancel_timer(Timer& timer, bool* was_in_use)
if (!did_already_run) {
timer.clear_in_use();
ScopedSpinlock lock(g_timerqueue_lock);
SpinlockLocker lock(g_timerqueue_lock);
if (timer_queue.list.contains(timer)) {
// The timer has not fired, remove it
VERIFY(timer.ref_count() > 1);
@ -251,7 +251,7 @@ void TimerQueue::remove_timer_locked(Queue& queue, Timer& timer)
void TimerQueue::fire()
{
ScopedSpinlock lock(g_timerqueue_lock);
SpinlockLocker lock(g_timerqueue_lock);
auto fire_timers = [&](Queue& queue) {
auto* timer = queue.list.first();
@ -274,7 +274,7 @@ void TimerQueue::fire()
// our reference and don't execute the callback.
if (!timer->set_cancelled()) {
timer->m_callback();
ScopedSpinlock lock(g_timerqueue_lock);
SpinlockLocker lock(g_timerqueue_lock);
m_timers_executing.remove(*timer);
}
timer->clear_in_use();