RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 05:38:11 +00:00
Code Issues Activity Actions

Kernel: Port process thread lists to SpinLockProtectedValue

Browse source 
I had to move the thread list out of the protected base area of Process
so that it could live with its lock (which needs to be mutable).
Ideally it would live in the protected area, so maybe we can figure out
a way to do that later.
This commit is contained in:
Andreas Kling 2021-08-07 13:28:18 +02:00
parent d6667e4cb8
commit b197fc40a7
3 changed files with 38 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

52
Kernel/Process.h
View file

@ -102,7 +102,6 @@ protected:
mode_t m_umask { 022 };
VirtualAddress m_signal_trampoline;
Atomic<u32> m_thread_count { 0 };
IntrusiveList<Thread, RawPtr<Thread>, &Thread::m_process_thread_list_node> m_thread_list;
u8 m_termination_status { 0 };
u8 m_termination_signal { 0 };
};
@ -724,9 +723,12 @@ public:
const FileDescriptions& fds() const { return m_fds; }
private:
FileDescriptions m_fds;
SpinLockProtectedValue<Thread::ListInProcess>& thread_list() { return m_thread_list; }
SpinLockProtectedValue<Thread::ListInProcess> const& thread_list() const { return m_thread_list; }
mutable RecursiveSpinLock m_thread_list_lock;
SpinLockProtectedValue<Thread::ListInProcess> m_thread_list;
FileDescriptions m_fds;
const bool m_is_kernel_process;
Atomic<State> m_state { State::Running };
@ -818,25 +820,27 @@ inline void Process::for_each_child(Callback callback)
template<IteratorFunction<Thread&> Callback>
inline IterationDecision Process::for_each_thread(Callback callback) const
{
ScopedSpinLock thread_list_lock(m_thread_list_lock);
for (auto& thread : m_thread_list) {
IterationDecision decision = callback(thread);
if (decision != IterationDecision::Continue)
return decision;
}
return IterationDecision::Continue;
return thread_list().with([&](auto& thread_list) -> IterationDecision {
for (auto& thread : thread_list) {
IterationDecision decision = callback(thread);
if (decision != IterationDecision::Continue)
return decision;
}
return IterationDecision::Continue;
});
}
template<IteratorFunction<Thread&> Callback>
inline IterationDecision Process::for_each_thread(Callback callback)
{
ScopedSpinLock thread_list_lock(m_thread_list_lock);
for (auto& thread : m_thread_list) {
IterationDecision decision = callback(thread);
if (decision != IterationDecision::Continue)
return decision;
}
return IterationDecision::Continue;
return thread_list().with([&](auto& thread_list) -> IterationDecision {
for (auto& thread : thread_list) {
IterationDecision decision = callback(thread);
if (decision != IterationDecision::Continue)
return decision;
}
return IterationDecision::Continue;
});
}
template<IteratorFunction<Process&> Callback>
@ -875,18 +879,20 @@ inline void Process::for_each_child(Callback callback)
template<VoidFunction<Thread&> Callback>
inline IterationDecision Process::for_each_thread(Callback callback) const
{
ScopedSpinLock thread_list_lock(m_thread_list_lock);
for (auto& thread : m_thread_list)
callback(thread);
thread_list().with([&](auto& thread_list) {
for (auto& thread : thread_list)
callback(thread);
});
return IterationDecision::Continue;
}
template<VoidFunction<Thread&> Callback>
inline IterationDecision Process::for_each_thread(Callback callback)
{
ScopedSpinLock thread_list_lock(m_thread_list_lock);
for (auto& thread : m_thread_list)
callback(thread);
thread_list().with([&](auto& thread_list) {
for (auto& thread : thread_list)
callback(thread);
});
return IterationDecision::Continue;
}