Kernel: Port WorkQueue to WaitQueue

Author: implicitfield

Kernel/Tasks/WorkQueue.cpp

@@ -7,7 +7,6 @@
 
 #include <Kernel/Arch/Processor.h>
 #include <Kernel/Sections.h>
-#include <Kernel/Tasks/DeprecatedWaitQueue.h>
 #include <Kernel/Tasks/Process.h>
 #include <Kernel/Tasks/WorkQueue.h>
 
@@ -39,7 +38,7 @@ UNMAP_AFTER_INIT WorkQueue::WorkQueue(StringView name)
                 if (have_more)
                     continue;
             }
-            [[maybe_unused]] auto result = m_wait_queue.wait_on({});
+            m_wait_queue.wait_until(m_items, [](auto& items) -> bool { return !items.is_empty(); });
         }
         Process::current().sys$exit(0);
         VERIFY_NOT_REACHED();
@@ -52,7 +51,7 @@ void WorkQueue::do_queue(WorkItem& item)
     m_items.with([&](auto& items) {
         items.append(item);
     });
-    m_wait_queue.wake_one();
+    m_wait_queue.notify_one();
 }
 
 }

Kernel/Tasks/WorkQueue.h

@@ -11,7 +11,7 @@
 #include <AK/IntrusiveList.h>
 #include <Kernel/Forward.h>
 #include <Kernel/Locking/SpinlockProtected.h>
-#include <Kernel/Tasks/DeprecatedWaitQueue.h>
+#include <Kernel/Tasks/WaitQueue.h>
 
 namespace Kernel {
 
@@ -62,8 +62,8 @@ class WorkQueue {
     void do_queue(WorkItem&);
 
     RefPtr<Thread> m_thread;
-    DeprecatedWaitQueue m_wait_queue;
-    RecursiveSpinlockProtected<IntrusiveList<&WorkItem::m_node>, LockRank::None> m_items {};
+    WaitQueue m_wait_queue;
+    SpinlockProtected<IntrusiveList<&WorkItem::m_node>, LockRank::None> m_items {};
 };
 
 }