CCF_100
/
yuzu-mirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #6511 from ReinUsesLisp/core-is-powered-data-race 

core: Make is_powered_on atomic
master
Mai M 2021-06-22 04:28:38 +07:00 committed by GitHub
parent 2a7a65c944 c9c8537643
commit 698add8541
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/core/core.cpp
Unescape Escape View File

@ -3,6 +3,7 @@
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include <array> #include <array>
#include <atomic>
#include <memory> #include <memory>
#include <utility> #include <utility>
@ -377,7 +378,7 @@ struct System::Impl {
std::unique_ptr<Core::DeviceMemory> device_memory; std::unique_ptr<Core::DeviceMemory> device_memory;
Core::Memory::Memory memory; Core::Memory::Memory memory;
CpuManager cpu_manager; CpuManager cpu_manager;
bool is_powered_on = false; std::atomic_bool is_powered_on{};
bool exit_lock = false; bool exit_lock = false;
Reporter reporter; Reporter reporter;
@ -463,7 +464,7 @@ System::ResultStatus System::Load(Frontend::EmuWindow& emu_window, const std::st
} }
bool System::IsPoweredOn() const { bool System::IsPoweredOn() const {
return impl->is_powered_on; return impl->is_powered_on.load(std::memory_order::relaxed);
} }
void System::PrepareReschedule() { void System::PrepareReschedule() {