diff --git a/Kernel/ProcessGroup.cpp b/Kernel/ProcessGroup.cpp index 23c429815b..3a92151e51 100644 --- a/Kernel/ProcessGroup.cpp +++ b/Kernel/ProcessGroup.cpp @@ -30,31 +30,18 @@ RefPtr ProcessGroup::create(ProcessGroupID pgid) RefPtr ProcessGroup::find_or_create(ProcessGroupID pgid) { - // Avoid allocating under spinlock, this compromises by wasting the - // allocation when we race with another process to see if they have - // already created a process group. - auto process_group = adopt_ref_if_nonnull(new ProcessGroup(pgid)); ScopedSpinLock lock(g_process_groups_lock); - if (auto existing = from_pgid_nolock(pgid)) + if (auto existing = from_pgid(pgid)) return existing.release_nonnull(); - if (!process_group) - return {}; - - g_process_groups->prepend(process_group); - return process_group; + return create(pgid); } RefPtr ProcessGroup::from_pgid(ProcessGroupID pgid) { ScopedSpinLock lock(g_process_groups_lock); - return from_pgid_nolock(pgid); -} -RefPtr ProcessGroup::from_pgid_nolock(ProcessGroupID pgid) -{ - VERIFY(g_process_groups_lock.own_lock()); for (auto& group : *g_process_groups) { if (group.pgid() == pgid) return &group; diff --git a/Kernel/ProcessGroup.h b/Kernel/ProcessGroup.h index fac329f1ec..8ae5f295f5 100644 --- a/Kernel/ProcessGroup.h +++ b/Kernel/ProcessGroup.h @@ -40,8 +40,6 @@ private: { } - static RefPtr from_pgid_nolock(ProcessGroupID); - ProcessGroup* m_prev { nullptr }; ProcessGroup* m_next { nullptr };