mirror of
https://github.com/SerenityOS/serenity
synced 2024-09-06 17:06:31 +00:00
Kernel: Use SpinlockProtected<T> in WorkQueue
This commit is contained in:
parent
b443e9e1a9
commit
44b273f3ac
|
@ -1,10 +1,10 @@
|
|||
/*
|
||||
* Copyright (c) 2021, the SerenityOS developers.
|
||||
* Copyright (c) 2021, Andreas Kling <kling@serenityos.org>
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-2-Clause
|
||||
*/
|
||||
|
||||
#include <Kernel/Locking/Spinlock.h>
|
||||
#include <Kernel/Process.h>
|
||||
#include <Kernel/Sections.h>
|
||||
#include <Kernel/WaitQueue.h>
|
||||
|
@ -29,11 +29,10 @@ UNMAP_AFTER_INIT WorkQueue::WorkQueue(StringView name)
|
|||
for (;;) {
|
||||
WorkItem* item;
|
||||
bool have_more;
|
||||
{
|
||||
SpinlockLocker lock(m_lock);
|
||||
item = m_items.take_first();
|
||||
have_more = !m_items.is_empty();
|
||||
}
|
||||
m_items.with([&](auto& items) {
|
||||
item = items.take_first();
|
||||
have_more = !items.is_empty();
|
||||
});
|
||||
if (item) {
|
||||
item->function();
|
||||
delete item;
|
||||
|
@ -50,10 +49,9 @@ UNMAP_AFTER_INIT WorkQueue::WorkQueue(StringView name)
|
|||
|
||||
void WorkQueue::do_queue(WorkItem* item)
|
||||
{
|
||||
{
|
||||
SpinlockLocker lock(m_lock);
|
||||
m_items.append(*item);
|
||||
}
|
||||
m_items.with([&](auto& items) {
|
||||
items.append(*item);
|
||||
});
|
||||
m_wait_queue.wake_one();
|
||||
}
|
||||
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
/*
|
||||
* Copyright (c) 2021, the SerenityOS developers.
|
||||
* Copyright (c) 2021, Andreas Kling <kling@serenityos.org>
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-2-Clause
|
||||
*/
|
||||
|
@ -8,6 +9,7 @@
|
|||
|
||||
#include <AK/IntrusiveList.h>
|
||||
#include <Kernel/Forward.h>
|
||||
#include <Kernel/Locking/SpinlockProtected.h>
|
||||
|
||||
namespace Kernel {
|
||||
|
||||
|
@ -51,8 +53,7 @@ private:
|
|||
|
||||
RefPtr<Thread> m_thread;
|
||||
WaitQueue m_wait_queue;
|
||||
IntrusiveList<&WorkItem::m_node> m_items;
|
||||
Spinlock m_lock;
|
||||
SpinlockProtected<IntrusiveList<&WorkItem::m_node>> m_items;
|
||||
};
|
||||
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue