From a439cdf22ea50f0e39cb51f6dff15fee3b495d16 Mon Sep 17 00:00:00 2001
From: Fernando Sahmkow <fsahmkow27@gmail.com>
Date: Tue, 10 Mar 2020 11:50:33 -0400
Subject: CPU_Manager: Unload/Reload threads on preemption on SingleCore
---
src/core/cpu_manager.cpp | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
(limited to 'src/core/cpu_manager.cpp')
diff --git a/src/core/cpu_manager.cpp b/src/core/cpu_manager.cpp
index e72f898083..95842aad10 100644
--- a/src/core/cpu_manager.cpp
+++ b/src/core/cpu_manager.cpp
@@ -225,7 +225,7 @@ void CpuManager::SingleCoreRunGuestLoop() {
}
physical_core.ClearExclusive();
PreemptSingleCore();
- auto& scheduler = physical_core.Scheduler();
+ auto& scheduler = kernel.Scheduler(current_core);
scheduler.TryDoContextSwitch();
}
}
@@ -260,11 +260,15 @@ void CpuManager::SingleCoreRunSuspendThread() {
void CpuManager::PreemptSingleCore() {
preemption_count = 0;
std::size_t old_core = current_core;
- current_core = (current_core + 1) % Core::Hardware::NUM_CPU_CORES;
+ current_core.store((current_core + 1) % Core::Hardware::NUM_CPU_CORES);
auto& scheduler = system.Kernel().Scheduler(old_core);
- Kernel::Thread* current_thread = system.Kernel().Scheduler(old_core).GetCurrentThread();
- Kernel::Thread* next_thread = system.Kernel().Scheduler(current_core).GetCurrentThread();
- Common::Fiber::YieldTo(current_thread->GetHostContext(), next_thread->GetHostContext());
+ Kernel::Thread* current_thread = scheduler.GetCurrentThread();
+ scheduler.Unload();
+ auto& next_scheduler = system.Kernel().Scheduler(current_core);
+ Common::Fiber::YieldTo(current_thread->GetHostContext(), next_scheduler.ControlContext());
+ /// May have changed scheduler
+ auto& current_scheduler = system.Kernel().Scheduler(current_core);
+ current_scheduler.Reload();
}
void CpuManager::SingleCorePause(bool paused) {
--
cgit v1.2.3-70-g09d2