浏览代码

Kernel: Remove unused WaitQueue::should_block(bool)

Nothing ever changed the state of WaitQueue::m_should_block, so this
removes the variable entirely.
Andreas Kling 3 年之前
父节点
当前提交
a82b5e6e50
共有 2 个文件被更改,包括 2 次插入9 次删除
  1. 2 2
      Kernel/WaitQueue.cpp
  2. 0 7
      Kernel/WaitQueue.h

+ 2 - 2
Kernel/WaitQueue.cpp

@@ -15,9 +15,9 @@ bool WaitQueue::should_add_blocker(Thread::Blocker& b, void* data)
     VERIFY(data != nullptr); // Thread that is requesting to be blocked
     VERIFY(m_lock.is_locked());
     VERIFY(b.blocker_type() == Thread::Blocker::Type::Queue);
-    if (m_wake_requested || !m_should_block) {
+    if (m_wake_requested) {
         m_wake_requested = false;
-        dbgln_if(WAITQUEUE_DEBUG, "WaitQueue @ {}: do not block thread {}, {}", this, data, m_should_block ? "wake was pending" : "not blocking");
+        dbgln_if(WAITQUEUE_DEBUG, "WaitQueue @ {}: do not block thread {}", this, data);
         return false;
     }
     dbgln_if(WAITQUEUE_DEBUG, "WaitQueue @ {}: should block thread {}", this, data);

+ 0 - 7
Kernel/WaitQueue.h

@@ -18,12 +18,6 @@ public:
     u32 wake_n(u32 wake_count);
     u32 wake_all();
 
-    void should_block(bool block)
-    {
-        SpinlockLocker lock(m_lock);
-        m_should_block = block;
-    }
-
     template<class... Args>
     Thread::BlockResult wait_on(const Thread::BlockTimeout& timeout, Args&&... args)
     {
@@ -41,7 +35,6 @@ protected:
 
 private:
     bool m_wake_requested { false };
-    bool m_should_block { true };
 };
 
 }