diff options
author | Andreas Kling <kling@serenityos.org> | 2022-08-19 20:53:40 +0200 |
---|---|---|
committer | Andreas Kling <kling@serenityos.org> | 2022-08-20 17:20:43 +0200 |
commit | 11eee67b8510767d76fb4793e3b62ac1793dd723 (patch) | |
tree | 8ce47a3813ce74bba56c60f62b29bdd6cdf287da /Kernel/TimerQueue.h | |
parent | e475263113387404e63cdc3666391934604eb6e7 (diff) | |
download | serenity-11eee67b8510767d76fb4793e3b62ac1793dd723.zip |
Kernel: Make self-contained locking smart pointers their own classes
Until now, our kernel has reimplemented a number of AK classes to
provide automatic internal locking:
- RefPtr
- NonnullRefPtr
- WeakPtr
- Weakable
This patch renames the Kernel classes so that they can coexist with
the original AK classes:
- RefPtr => LockRefPtr
- NonnullRefPtr => NonnullLockRefPtr
- WeakPtr => LockWeakPtr
- Weakable => LockWeakable
The goal here is to eventually get rid of the Lock* classes in favor of
using external locking.
Diffstat (limited to 'Kernel/TimerQueue.h')
-rw-r--r-- | Kernel/TimerQueue.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Kernel/TimerQueue.h b/Kernel/TimerQueue.h index 9163957961..d309315979 100644 --- a/Kernel/TimerQueue.h +++ b/Kernel/TimerQueue.h @@ -9,9 +9,9 @@ #include <AK/AtomicRefCounted.h> #include <AK/Function.h> #include <AK/IntrusiveList.h> -#include <AK/NonnullRefPtr.h> #include <AK/OwnPtr.h> #include <AK/Time.h> +#include <Kernel/Library/NonnullLockRefPtr.h> #include <Kernel/Time/TimeManagement.h> namespace Kernel { @@ -87,8 +87,8 @@ public: TimerQueue(); static TimerQueue& the(); - TimerId add_timer(NonnullRefPtr<Timer>&&); - bool add_timer_without_id(NonnullRefPtr<Timer>, clockid_t, Time const&, Function<void()>&&); + TimerId add_timer(NonnullLockRefPtr<Timer>&&); + bool add_timer_without_id(NonnullLockRefPtr<Timer>, clockid_t, Time const&, Function<void()>&&); bool cancel_timer(Timer& timer, bool* was_in_use = nullptr); void fire(); @@ -99,7 +99,7 @@ private: }; void remove_timer_locked(Queue&, Timer&); void update_next_timer_due(Queue&); - void add_timer_locked(NonnullRefPtr<Timer>); + void add_timer_locked(NonnullLockRefPtr<Timer>); Queue& queue_for_timer(Timer& timer) { |