yuzu-emu
/
yuzu-mainline
Archived
1
0
Fork 0
Code

Merge pull request #4978 from bunnei/shutdown-crash 

core: cpu_manager: Fix shutdown crash when closing before emulation starts.
This commit is contained in:
bunnei 2020-11-25 01:20:01 -08:00 committed by GitHub
parent d1da7eb119 3359e5ab70
commit 9aeada734d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/core/cpu_manager.cpp
View File

@ -4,6 +4,7 @@
#include "common/fiber.h" #include "common/fiber.h"
#include "common/microprofile.h" #include "common/microprofile.h"
#include "common/scope_exit.h"
#include "common/thread.h" #include "common/thread.h"
#include "core/arm/exclusive_monitor.h" #include "core/arm/exclusive_monitor.h"
#include "core/core.h" #include "core/core.h"
@ -343,6 +344,16 @@ void CpuManager::RunThread(std::size_t core) {
data.initialized = true; data.initialized = true;
const bool sc_sync = !is_async_gpu && !is_multicore; const bool sc_sync = !is_async_gpu && !is_multicore;
bool sc_sync_first_use = sc_sync; bool sc_sync_first_use = sc_sync;
// Cleanup
SCOPE_EXIT({
data.host_context->Exit();
data.enter_barrier.reset();
data.exit_barrier.reset();
data.initialized = false;
MicroProfileOnThreadExit();
});
/// Running /// Running
while (running_mode) { while (running_mode) {
data.is_running = false; data.is_running = false;
@ -351,6 +362,12 @@ void CpuManager::RunThread(std::size_t core) {
system.GPU().ObtainContext(); system.GPU().ObtainContext();
sc_sync_first_use = false; sc_sync_first_use = false;
} }
// Abort if emulation was killed before the session really starts
if (!system.IsPoweredOn()) {
return;
}
auto& scheduler = system.Kernel().CurrentScheduler(); auto& scheduler = system.Kernel().CurrentScheduler();
Kernel::Thread* current_thread = scheduler.GetCurrentThread(); Kernel::Thread* current_thread = scheduler.GetCurrentThread();
data.is_running = true; data.is_running = true;
@ -360,13 +377,6 @@ void CpuManager::RunThread(std::size_t core) {
data.exit_barrier->Wait(); data.exit_barrier->Wait();
data.is_paused = false; data.is_paused = false;
} }
/// Time to cleanup
data.host_context->Exit();
data.enter_barrier.reset();
data.exit_barrier.reset();
data.initialized = false;
MicroProfileOnThreadExit();
} }
} // namespace Core } // namespace Core