diff options
| author | 2022-03-12 03:06:57 -0800 | |
|---|---|---|
| committer | 2022-03-14 18:14:54 -0700 | |
| commit | 5f3e77d93e93dded50b2fcf9f67291442197e567 (patch) | |
| tree | 760e2cc11ac422fe1b330fd6d3649e77c7699f83 /src/core/hle/kernel/kernel.cpp | |
| parent | core: hle: kernel: Downgrade dangling objects warning to debug. (diff) | |
| download | yuzu-5f3e77d93e93dded50b2fcf9f67291442197e567.tar.gz yuzu-5f3e77d93e93dded50b2fcf9f67291442197e567.tar.xz yuzu-5f3e77d93e93dded50b2fcf9f67291442197e567.zip | |
core: hle: kernel: Allocate dummy threads on host thread storage.
- Fixes a crash where on subsequent boots, long-lived host threads would have their dummy threads freed.
Diffstat (limited to 'src/core/hle/kernel/kernel.cpp')
| -rw-r--r-- | src/core/hle/kernel/kernel.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index 16d3a6cb4..f9828bc43 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp | |||
| @@ -283,15 +283,16 @@ struct KernelCore::Impl { | |||
| 283 | 283 | ||
| 284 | // Gets the dummy KThread for the caller, allocating a new one if this is the first time | 284 | // Gets the dummy KThread for the caller, allocating a new one if this is the first time |
| 285 | KThread* GetHostDummyThread() { | 285 | KThread* GetHostDummyThread() { |
| 286 | auto make_thread = [this]() { | 286 | auto initialize = [this](KThread* thread) { |
| 287 | KThread* thread = KThread::Create(system.Kernel()); | ||
| 288 | ASSERT(KThread::InitializeDummyThread(thread).IsSuccess()); | 287 | ASSERT(KThread::InitializeDummyThread(thread).IsSuccess()); |
| 289 | thread->SetName(fmt::format("DummyThread:{}", GetHostThreadId())); | 288 | thread->SetName(fmt::format("DummyThread:{}", GetHostThreadId())); |
| 290 | return thread; | 289 | return thread; |
| 291 | }; | 290 | }; |
| 292 | 291 | ||
| 293 | thread_local KThread* saved_thread = make_thread(); | 292 | thread_local auto raw_thread = KThread(system.Kernel()); |
| 294 | return saved_thread; | 293 | thread_local auto thread = initialize(&raw_thread); |
| 294 | |||
| 295 | return thread; | ||
| 295 | } | 296 | } |
| 296 | 297 | ||
| 297 | /// Registers a CPU core thread by allocating a host thread ID for it | 298 | /// Registers a CPU core thread by allocating a host thread ID for it |