N-archive/yuzu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

hle: kernel: KScheduler: Various style fixes based on code review feedback.

Browse source
This commit is contained in:
bunnei 2020-12-05 00:02:30 -08:00
parent 8fd921557f
commit 960500cfd2
2 changed files with 41 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/core/hle/kernel/k_scheduler.cpp
View file

@ -29,7 +29,7 @@ static void IncrementScheduledCount(Kernel::Thread* thread) {
} }
} }
/*static*/ void KScheduler::RescheduleCores(KernelCore& kernel, u64 cores_pending_reschedule, void KScheduler::RescheduleCores(KernelCore& kernel, u64 cores_pending_reschedule,
Core::EmuThreadHandle global_thread) { Core::EmuThreadHandle global_thread) {
u32 current_core = global_thread.host_handle; u32 current_core = global_thread.host_handle;
bool must_context_switch = global_thread.guest_handle != InvalidHandle && bool must_context_switch = global_thread.guest_handle != InvalidHandle &&
@ -81,7 +81,7 @@ u64 KScheduler::UpdateHighestPriorityThread(Thread* highest_thread) {
} }
} }
/*static*/ u64 KScheduler::UpdateHighestPriorityThreadsImpl(KernelCore& kernel) { u64 KScheduler::UpdateHighestPriorityThreadsImpl(KernelCore& kernel) {
ASSERT(kernel.GlobalSchedulerContext().IsLocked()); ASSERT(kernel.GlobalSchedulerContext().IsLocked());
// Clear that we need to update. // Clear that we need to update.
@ -94,7 +94,7 @@ u64 KScheduler::UpdateHighestPriorityThread(Thread* highest_thread) {
/// We want to go over all cores, finding the highest priority thread and determining if /// We want to go over all cores, finding the highest priority thread and determining if
/// scheduling is needed for that core. /// scheduling is needed for that core.
for (size_t core_id = 0; core_id < Core::Hardware::NUM_CPU_CORES; core_id++) { for (size_t core_id = 0; core_id < Core::Hardware::NUM_CPU_CORES; core_id++) {
Thread* top_thread = priority_queue.GetScheduledFront((s32)core_id); Thread* top_thread = priority_queue.GetScheduledFront(static_cast<s32>(core_id));
if (top_thread != nullptr) { if (top_thread != nullptr) {
// If the thread has no waiters, we need to check if the process has a thread pinned. // If the thread has no waiters, we need to check if the process has a thread pinned.
// TODO(bunnei): Implement thread pinning // TODO(bunnei): Implement thread pinning
@ -180,8 +180,7 @@ u64 KScheduler::UpdateHighestPriorityThread(Thread* highest_thread) {
return cores_needing_scheduling; return cores_needing_scheduling;
} }
/*static*/ void KScheduler::OnThreadStateChanged(KernelCore& kernel, Thread* thread, void KScheduler::OnThreadStateChanged(KernelCore& kernel, Thread* thread, u32 old_state) {
u32 old_state) {
ASSERT(kernel.GlobalSchedulerContext().IsLocked()); ASSERT(kernel.GlobalSchedulerContext().IsLocked());
// Check if the state has changed, because if it hasn't there's nothing to do. // Check if the state has changed, because if it hasn't there's nothing to do.
@ -204,8 +203,8 @@ u64 KScheduler::UpdateHighestPriorityThread(Thread* highest_thread) {
} }
} }
/*static*/ void KScheduler::OnThreadPriorityChanged(KernelCore& kernel, Thread* thread, void KScheduler::OnThreadPriorityChanged(KernelCore& kernel, Thread* thread, Thread* current_thread,
Thread* current_thread, u32 old_priority) { u32 old_priority) {
ASSERT(kernel.GlobalSchedulerContext().IsLocked()); ASSERT(kernel.GlobalSchedulerContext().IsLocked());
@ -218,9 +217,8 @@ u64 KScheduler::UpdateHighestPriorityThread(Thread* highest_thread) {
} }
} }
/*static*/ void KScheduler::OnThreadAffinityMaskChanged(KernelCore& kernel, Thread* thread, void KScheduler::OnThreadAffinityMaskChanged(KernelCore& kernel, Thread* thread,
const KAffinityMask& old_affinity, const KAffinityMask& old_affinity, s32 old_core) {
s32 old_core) {
ASSERT(kernel.GlobalSchedulerContext().IsLocked()); ASSERT(kernel.GlobalSchedulerContext().IsLocked());
// If the thread is runnable, we want to change its affinity in the queue. // If the thread is runnable, we want to change its affinity in the queue.
@ -331,30 +329,30 @@ void KScheduler::RotateScheduledQueue(s32 core_id, s32 priority) {
SetSchedulerUpdateNeeded(kernel); SetSchedulerUpdateNeeded(kernel);
} }
/*static*/ bool KScheduler::CanSchedule(KernelCore& kernel) { bool KScheduler::CanSchedule(KernelCore& kernel) {
return kernel.CurrentScheduler()->GetCurrentThread()->GetDisableDispatchCount() <= 1; return kernel.CurrentScheduler()->GetCurrentThread()->GetDisableDispatchCount() <= 1;
} }
/*static*/ bool KScheduler::IsSchedulerUpdateNeeded(const KernelCore& kernel) { bool KScheduler::IsSchedulerUpdateNeeded(const KernelCore& kernel) {
return kernel.GlobalSchedulerContext().scheduler_update_needed.load(std::memory_order_acquire); return kernel.GlobalSchedulerContext().scheduler_update_needed.load(std::memory_order_acquire);
} }
/*static*/ void KScheduler::SetSchedulerUpdateNeeded(KernelCore& kernel) { void KScheduler::SetSchedulerUpdateNeeded(KernelCore& kernel) {
kernel.GlobalSchedulerContext().scheduler_update_needed.store(true, std::memory_order_release); kernel.GlobalSchedulerContext().scheduler_update_needed.store(true, std::memory_order_release);
} }
/*static*/ void KScheduler::ClearSchedulerUpdateNeeded(KernelCore& kernel) { void KScheduler::ClearSchedulerUpdateNeeded(KernelCore& kernel) {
kernel.GlobalSchedulerContext().scheduler_update_needed.store(false, std::memory_order_release); kernel.GlobalSchedulerContext().scheduler_update_needed.store(false, std::memory_order_release);
} }
/*static*/ void KScheduler::DisableScheduling(KernelCore& kernel) { void KScheduler::DisableScheduling(KernelCore& kernel) {
if (auto* scheduler = kernel.CurrentScheduler(); scheduler) { if (auto* scheduler = kernel.CurrentScheduler(); scheduler) {
ASSERT(scheduler->GetCurrentThread()->GetDisableDispatchCount() >= 0); ASSERT(scheduler->GetCurrentThread()->GetDisableDispatchCount() >= 0);
scheduler->GetCurrentThread()->DisableDispatch(); scheduler->GetCurrentThread()->DisableDispatch();
} }
} }
/*static*/ void KScheduler::EnableScheduling(KernelCore& kernel, u64 cores_needing_scheduling, void KScheduler::EnableScheduling(KernelCore& kernel, u64 cores_needing_scheduling,
Core::EmuThreadHandle global_thread) { Core::EmuThreadHandle global_thread) {
if (auto* scheduler = kernel.CurrentScheduler(); scheduler) { if (auto* scheduler = kernel.CurrentScheduler(); scheduler) {
scheduler->GetCurrentThread()->EnableDispatch(); scheduler->GetCurrentThread()->EnableDispatch();
@ -362,7 +360,7 @@ void KScheduler::RotateScheduledQueue(s32 core_id, s32 priority) {
RescheduleCores(kernel, cores_needing_scheduling, global_thread); RescheduleCores(kernel, cores_needing_scheduling, global_thread);
} }
/*static*/ u64 KScheduler::UpdateHighestPriorityThreads(KernelCore& kernel) { u64 KScheduler::UpdateHighestPriorityThreads(KernelCore& kernel) {
if (IsSchedulerUpdateNeeded(kernel)) { if (IsSchedulerUpdateNeeded(kernel)) {
return UpdateHighestPriorityThreadsImpl(kernel); return UpdateHighestPriorityThreadsImpl(kernel);
} else { } else {
@ -370,7 +368,7 @@ void KScheduler::RotateScheduledQueue(s32 core_id, s32 priority) {
} }
} }
/*static*/ KSchedulerPriorityQueue& KScheduler::GetPriorityQueue(KernelCore& kernel) { KSchedulerPriorityQueue& KScheduler::GetPriorityQueue(KernelCore& kernel) {
return kernel.GlobalSchedulerContext().priority_queue; return kernel.GlobalSchedulerContext().priority_queue;
} }
@ -585,7 +583,7 @@ void KScheduler::YieldToAnyThread() {
KScheduler::KScheduler(Core::System& system, std::size_t core_id) KScheduler::KScheduler(Core::System& system, std::size_t core_id)
: system(system), core_id(core_id) { : system(system), core_id(core_id) {
switch_fiber = std::make_shared<Common::Fiber>(std::function<void(void*)>(OnSwitch), this); switch_fiber = std::make_shared<Common::Fiber>(OnSwitch, this);
this->state.needs_scheduling = true; this->state.needs_scheduling = true;
this->state.interrupt_task_thread_runnable = false; this->state.interrupt_task_thread_runnable = false;
this->state.should_count_idle = false; this->state.should_count_idle = false;
@ -722,7 +720,7 @@ void KScheduler::SwitchToCurrent() {
} }
const auto is_switch_pending = [this] { const auto is_switch_pending = [this] {
std::scoped_lock lock{guard}; std::scoped_lock lock{guard};
return !!this->state.needs_scheduling; return state.needs_scheduling.load(std::memory_order_relaxed);
}; };
do { do {
if (current_thread != nullptr && !current_thread->IsHLEThread()) { if (current_thread != nullptr && !current_thread->IsHLEThread()) {

49
src/core/hle/kernel/k_scheduler.h
View file

@ -51,32 +51,28 @@ public:
void Reload(Thread* thread); void Reload(Thread* thread);
/// Gets the current running thread /// Gets the current running thread
Thread* GetCurrentThread() const; [[nodiscard]] Thread* GetCurrentThread() const;
/// Gets the timestamp for the last context switch in ticks. /// Gets the timestamp for the last context switch in ticks.
u64 GetLastContextSwitchTicks() const; [[nodiscard]] u64 GetLastContextSwitchTicks() const;
bool ContextSwitchPending() const { [[nodiscard]] bool ContextSwitchPending() const {
return this->state.needs_scheduling; return state.needs_scheduling.load(std::memory_order_relaxed);
} }
void Initialize(); void Initialize();
void OnThreadStart(); void OnThreadStart();
std::shared_ptr<Common::Fiber>& ControlContext() { [[nodiscard]] std::shared_ptr<Common::Fiber>& ControlContext() {
return switch_fiber; return switch_fiber;
} }
const std::shared_ptr<Common::Fiber>& ControlContext() const { [[nodiscard]] const std::shared_ptr<Common::Fiber>& ControlContext() const {
return switch_fiber; return switch_fiber;
} }
std::size_t CurrentCoreId() const { [[nodiscard]] u64 UpdateHighestPriorityThread(Thread* highest_thread);
return core_id;
}
u64 UpdateHighestPriorityThread(Thread* highest_thread);
/** /**
* Takes a thread and moves it to the back of the it's priority list. * Takes a thread and moves it to the back of the it's priority list.
@ -114,7 +110,18 @@ public:
static void OnThreadAffinityMaskChanged(KernelCore& kernel, Thread* thread, static void OnThreadAffinityMaskChanged(KernelCore& kernel, Thread* thread,
const KAffinityMask& old_affinity, s32 old_core); const KAffinityMask& old_affinity, s32 old_core);
static bool CanSchedule(KernelCore& kernel);
static bool IsSchedulerUpdateNeeded(const KernelCore& kernel);
static void SetSchedulerUpdateNeeded(KernelCore& kernel);
static void ClearSchedulerUpdateNeeded(KernelCore& kernel);
static void DisableScheduling(KernelCore& kernel);
static void EnableScheduling(KernelCore& kernel, u64 cores_needing_scheduling,
Core::EmuThreadHandle global_thread);
[[nodiscard]] static u64 UpdateHighestPriorityThreads(KernelCore& kernel);
private: private:
friend class GlobalSchedulerContext;
/** /**
* Takes care of selecting the new scheduled threads in three steps: * Takes care of selecting the new scheduled threads in three steps:
* *
@ -129,25 +136,12 @@ private:
* *
* returns the cores needing scheduling. * returns the cores needing scheduling.
*/ */
static u64 UpdateHighestPriorityThreadsImpl(KernelCore& kernel); [[nodiscard]] static u64 UpdateHighestPriorityThreadsImpl(KernelCore& kernel);
[[nodiscard]] static KSchedulerPriorityQueue& GetPriorityQueue(KernelCore& kernel);
void RotateScheduledQueue(s32 core_id, s32 priority); void RotateScheduledQueue(s32 core_id, s32 priority);
public:
static bool CanSchedule(KernelCore& kernel);
static bool IsSchedulerUpdateNeeded(const KernelCore& kernel);
static void SetSchedulerUpdateNeeded(KernelCore& kernel);
static void ClearSchedulerUpdateNeeded(KernelCore& kernel);
static void DisableScheduling(KernelCore& kernel);
static void EnableScheduling(KernelCore& kernel, u64 cores_needing_scheduling,
Core::EmuThreadHandle global_thread);
static u64 UpdateHighestPriorityThreads(KernelCore& kernel);
private:
friend class GlobalSchedulerContext;
static KSchedulerPriorityQueue& GetPriorityQueue(KernelCore& kernel);
void Schedule() { void Schedule() {
ASSERT(GetCurrentThread()->GetDisableDispatchCount() == 1); ASSERT(GetCurrentThread()->GetDisableDispatchCount() == 1);
this->ScheduleImpl(); this->ScheduleImpl();
@ -175,7 +169,6 @@ private:
static void OnSwitch(void* this_scheduler); static void OnSwitch(void* this_scheduler);
void SwitchToCurrent(); void SwitchToCurrent();
private:
Thread* current_thread{}; Thread* current_thread{};
Thread* idle_thread{}; Thread* idle_thread{};