From 51fb0a6f9647ba199da10fe4f018ee36e44e65ba Mon Sep 17 00:00:00 2001 From: bunnei Date: Sat, 27 Feb 2021 11:56:04 -0800 Subject: core: Switch to unique_ptr for usage of Common::Fiber. - With using unique_ptr instead of shared_ptr, we have more explicit ownership of the context. - Fixes a memory leak due to circular reference of the shared pointer. --- src/core/hle/kernel/k_scheduler.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/core/hle/kernel/k_scheduler.cpp') diff --git a/src/core/hle/kernel/k_scheduler.cpp b/src/core/hle/kernel/k_scheduler.cpp index bb5f43b53..465036f3d 100644 --- a/src/core/hle/kernel/k_scheduler.cpp +++ b/src/core/hle/kernel/k_scheduler.cpp @@ -608,7 +608,7 @@ void KScheduler::YieldToAnyThread(KernelCore& kernel) { } KScheduler::KScheduler(Core::System& system, s32 core_id) : system(system), core_id(core_id) { - switch_fiber = std::make_shared(OnSwitch, this); + switch_fiber = std::make_unique(OnSwitch, this); state.needs_scheduling.store(true); state.interrupt_task_thread_runnable = false; state.should_count_idle = false; @@ -726,15 +726,15 @@ void KScheduler::ScheduleImpl() { // Save context for previous thread Unload(previous_thread); - std::shared_ptr* old_context; + Common::Fiber* old_context; if (previous_thread != nullptr) { - old_context = &previous_thread->GetHostContext(); + old_context = previous_thread->GetHostContext(); } else { - old_context = &idle_thread->GetHostContext(); + old_context = idle_thread->GetHostContext(); } guard.unlock(); - Common::Fiber::YieldTo(*old_context, switch_fiber); + Common::Fiber::YieldTo(old_context, switch_fiber.get()); /// When a thread wakes up, the scheduler may have changed to other in another core. auto& next_scheduler = *system.Kernel().CurrentScheduler(); next_scheduler.SwitchContextStep2(); @@ -769,13 +769,13 @@ void KScheduler::SwitchToCurrent() { break; } } - std::shared_ptr* next_context; + Common::Fiber* next_context; if (next_thread != nullptr) { - next_context = &next_thread->GetHostContext(); + next_context = next_thread->GetHostContext(); } else { - next_context = &idle_thread->GetHostContext(); + next_context = idle_thread->GetHostContext(); } - Common::Fiber::YieldTo(switch_fiber, *next_context); + Common::Fiber::YieldTo(switch_fiber.get(), next_context); } while (!is_switch_pending()); } } -- cgit v1.2.3