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

Kernel: Simplify the per-CPU SchedulerData struct

Browse source
This commit is contained in:
Andreas Kling 2021-08-08 11:09:35 +02:00
parent 5712e46ddc
commit a1c82041a6
2 changed files with 13 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Kernel/Forward.h
View file

@ -48,7 +48,6 @@ class Process;
class ProcessGroup; class ProcessGroup;
class RecursiveSpinLock; class RecursiveSpinLock;
class Scheduler; class Scheduler;
class SchedulerData;
class Socket; class Socket;
class SysFS; class SysFS;
class SysFSDirectory; class SysFSDirectory;

32
Kernel/Scheduler.cpp
View file

@ -21,16 +21,10 @@
namespace Kernel { namespace Kernel {
class SchedulerData { struct SchedulerData {
AK_MAKE_NONCOPYABLE(SchedulerData);
AK_MAKE_NONMOVABLE(SchedulerData);
public:
static ProcessorSpecificDataID processor_specific_data_id() { return ProcessorSpecificDataID::Scheduler; } static ProcessorSpecificDataID processor_specific_data_id() { return ProcessorSpecificDataID::Scheduler; }
SchedulerData() = default; bool in_scheduler { true };
bool m_in_scheduler { true };
}; };
RecursiveSpinLock g_scheduler_lock; RecursiveSpinLock g_scheduler_lock;
@ -210,18 +204,18 @@ bool Scheduler::pick_next()
{ {
VERIFY_INTERRUPTS_DISABLED(); VERIFY_INTERRUPTS_DISABLED();
// Set the m_in_scheduler flag before acquiring the spinlock. This // Set the in_scheduler flag before acquiring the spinlock. This
// prevents a recursive call into Scheduler::invoke_async upon // prevents a recursive call into Scheduler::invoke_async upon
// leaving the scheduler lock. // leaving the scheduler lock.
ScopedCritical critical; ScopedCritical critical;
ProcessorSpecific<SchedulerData>::get().m_in_scheduler = true; ProcessorSpecific<SchedulerData>::get().in_scheduler = true;
ScopeGuard guard( ScopeGuard guard(
[]() { []() {
// We may be on a different processor after we got switched // We may be on a different processor after we got switched
// back to this thread! // back to this thread!
auto& scheduler_data = ProcessorSpecific<SchedulerData>::get(); auto& scheduler_data = ProcessorSpecific<SchedulerData>::get();
VERIFY(scheduler_data.m_in_scheduler); VERIFY(scheduler_data.in_scheduler);
scheduler_data.m_in_scheduler = false; scheduler_data.in_scheduler = false;
}); });
ScopedSpinLock lock(g_scheduler_lock); ScopedSpinLock lock(g_scheduler_lock);
@ -360,8 +354,8 @@ void Scheduler::leave_on_first_switch(u32 flags)
// clean up and release locks manually here // clean up and release locks manually here
g_scheduler_lock.unlock(flags); g_scheduler_lock.unlock(flags);
auto& scheduler_data = ProcessorSpecific<SchedulerData>::get(); auto& scheduler_data = ProcessorSpecific<SchedulerData>::get();
VERIFY(scheduler_data.m_in_scheduler); VERIFY(scheduler_data.in_scheduler);
scheduler_data.m_in_scheduler = false; scheduler_data.in_scheduler = false;
} }
void Scheduler::prepare_after_exec() void Scheduler::prepare_after_exec()
@ -370,8 +364,8 @@ void Scheduler::prepare_after_exec()
// the new process. This is called from Processor::assume_context // the new process. This is called from Processor::assume_context
VERIFY(g_scheduler_lock.own_lock()); VERIFY(g_scheduler_lock.own_lock());
auto& scheduler_data = ProcessorSpecific<SchedulerData>::get(); auto& scheduler_data = ProcessorSpecific<SchedulerData>::get();
VERIFY(!scheduler_data.m_in_scheduler); VERIFY(!scheduler_data.in_scheduler);
scheduler_data.m_in_scheduler = true; scheduler_data.in_scheduler = true;
} }
void Scheduler::prepare_for_idle_loop() void Scheduler::prepare_for_idle_loop()
@ -381,8 +375,8 @@ void Scheduler::prepare_for_idle_loop()
VERIFY(!g_scheduler_lock.own_lock()); VERIFY(!g_scheduler_lock.own_lock());
g_scheduler_lock.lock(); g_scheduler_lock.lock();
auto& scheduler_data = ProcessorSpecific<SchedulerData>::get(); auto& scheduler_data = ProcessorSpecific<SchedulerData>::get();
VERIFY(!scheduler_data.m_in_scheduler); VERIFY(!scheduler_data.in_scheduler);
scheduler_data.m_in_scheduler = true; scheduler_data.in_scheduler = true;
} }
Process* Scheduler::colonel() Process* Scheduler::colonel()
@ -516,7 +510,7 @@ void Scheduler::invoke_async()
// Since this function is called when leaving critical sections (such // Since this function is called when leaving critical sections (such
// as a SpinLock), we need to check if we're not already doing this // as a SpinLock), we need to check if we're not already doing this
// to prevent recursion // to prevent recursion
if (!ProcessorSpecific<SchedulerData>::get().m_in_scheduler) if (!ProcessorSpecific<SchedulerData>::get().in_scheduler)
pick_next(); pick_next();
} }