system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-09-06 17:06:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Kernel: Implement FUTEX_WAKE of arbitrary count.

Browse source 
Previously we just woke all waiters no matter how many were
requested. Fix this by implementing WaitQueue::wake_n(..).
This commit is contained in:
Brian Gianforcaro 2020-04-25 16:57:12 -07:00 committed by Andreas Kling
parent e8f6f655bf
commit 1f64e3eb16
3 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Kernel/Process.cpp
View file

@ -4636,8 +4636,7 @@ int Process::sys$futex(const Syscall::SC_futex_params* user_params)
if (value == 1) {
futex_queue(userspace_address).wake_one();
} else {
// FIXME: Wake exactly (value) waiters.
futex_queue(userspace_address).wake_all();
futex_queue(userspace_address).wake_n(value);
}
break;
}

15
Kernel/WaitQueue.cpp
View file

@ -55,6 +55,21 @@ void WaitQueue::wake_one(Atomic<bool>* lock)
Scheduler::stop_idling();
}
void WaitQueue::wake_n(i32 wake_count)
{
InterruptDisabler disabler;
if (m_threads.is_empty())
return;
for (i32 i = 0; i < wake_count; ++i) {
Thread* thread = m_threads.take_first();
if (!thread)
break;
thread->wake_from_queue();
}
Scheduler::stop_idling();
}
void WaitQueue::wake_all()
{
InterruptDisabler disabler;

1
Kernel/WaitQueue.h
View file

@ -39,6 +39,7 @@ public:
void enqueue(Thread&);
void wake_one(Atomic<bool>* lock = nullptr);
void wake_n(i32 wake_count);
void wake_all();
void clear();