diff options
| author | Liam <byteslice@airmail.cc> | 2022-06-30 16:54:05 -0400 |
|---|---|---|
| committer | Liam <byteslice@airmail.cc> | 2022-06-30 16:54:05 -0400 |
| commit | 2c1e2c63c302dc4a2f0ad3452263d715d77aba8c (patch) | |
| tree | 1996677a825ccabe6a7d497c59d29f8e4672fa66 | |
| parent | 603952bc27aca2e17d39def7710d9af36791f15c (diff) | |
cpu_manager: properly check idle on return from preemption
| -rw-r--r-- | src/core/cpu_manager.cpp | 4 | ||||
| -rw-r--r-- | src/core/hle/kernel/k_scheduler.h | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/core/cpu_manager.cpp b/src/core/cpu_manager.cpp index fd6928105a..9fc78f033c 100644 --- a/src/core/cpu_manager.cpp +++ b/src/core/cpu_manager.cpp @@ -194,7 +194,9 @@ void CpuManager::PreemptSingleCore(bool from_running_enviroment) { { auto& scheduler = system.Kernel().Scheduler(current_core); scheduler.Reload(scheduler.GetSchedulerCurrentThread()); - idle_count = 0; + if (!scheduler.IsIdle()) { + idle_count = 0; + } } } diff --git a/src/core/hle/kernel/k_scheduler.h b/src/core/hle/kernel/k_scheduler.h index 3f90656eee..cc3da33f51 100644 --- a/src/core/hle/kernel/k_scheduler.h +++ b/src/core/hle/kernel/k_scheduler.h @@ -55,6 +55,11 @@ public: return idle_thread; } + /// Returns true if the scheduler is idle + [[nodiscard]] bool IsIdle() const { + return GetSchedulerCurrentThread() == idle_thread; + } + /// Gets the timestamp for the last context switch in ticks. [[nodiscard]] u64 GetLastContextSwitchTicks() const; |