diff options
author | bunnei <bunneidev@gmail.com> | 2021-03-06 02:15:35 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-06 02:15:35 +0100 |
commit | 4cf5b860bddbce9a5dd121ab388bdf369a877e02 (patch) | |
tree | dee4656dedce8b55888e4199b0013c9fce167e05 /src/core/hle/kernel/kernel.cpp | |
parent | Merge pull request #6029 from Morph1984/compile-utf8 (diff) | |
parent | hle: kernel: KThread: Rework dummy threads & fix memory leak. (diff) | |
download | yuzu-4cf5b860bddbce9a5dd121ab388bdf369a877e02.tar yuzu-4cf5b860bddbce9a5dd121ab388bdf369a877e02.tar.gz yuzu-4cf5b860bddbce9a5dd121ab388bdf369a877e02.tar.bz2 yuzu-4cf5b860bddbce9a5dd121ab388bdf369a877e02.tar.lz yuzu-4cf5b860bddbce9a5dd121ab388bdf369a877e02.tar.xz yuzu-4cf5b860bddbce9a5dd121ab388bdf369a877e02.tar.zst yuzu-4cf5b860bddbce9a5dd121ab388bdf369a877e02.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hle/kernel/kernel.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index 331cf3a60..780008b08 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp @@ -181,9 +181,9 @@ struct KernelCore::Impl { std::string name = "Suspend Thread Id:" + std::to_string(i); std::function<void(void*)> init_func = Core::CpuManager::GetSuspendThreadStartFunc(); void* init_func_parameter = system.GetCpuManager().GetStartFuncParamater(); - auto thread_res = KThread::Create(system, ThreadType::HighPriority, std::move(name), 0, - 0, 0, static_cast<u32>(i), 0, nullptr, - std::move(init_func), init_func_parameter); + auto thread_res = KThread::CreateThread( + system, ThreadType::HighPriority, std::move(name), 0, 0, 0, static_cast<u32>(i), 0, + nullptr, std::move(init_func), init_func_parameter); suspend_threads[i] = std::move(thread_res).Unwrap(); } @@ -221,10 +221,9 @@ struct KernelCore::Impl { // Gets the dummy KThread for the caller, allocating a new one if this is the first time KThread* GetHostDummyThread() { const thread_local auto thread = - KThread::Create( + KThread::CreateThread( system, ThreadType::Main, fmt::format("DummyThread:{}", GetHostThreadId()), 0, - KThread::DefaultThreadPriority, 0, static_cast<u32>(3), 0, nullptr, - []([[maybe_unused]] void* arg) { UNREACHABLE(); }, nullptr) + KThread::DefaultThreadPriority, 0, static_cast<u32>(3), 0, nullptr) .Unwrap(); return thread.get(); } |