ShuriZma
/
xenia
mirror of https://github.com/xenia-project/xenia.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Hold the global lock while restoring from a file.

This commit is contained in:
Dr. Chat 2015-12-06 17:45:40 -06:00 committed by Ben Vanik
parent a6322c7bf4
commit 20fb20d7f6
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/xenia/emulator.cc
View File

@ -347,6 +347,8 @@ bool Emulator::SaveToFile(const std::wstring& path) {
ByteStream stream(map->data(), map->size()); ByteStream stream(map->data(), map->size());
stream.Write('XSAV'); stream.Write('XSAV');
// It's important we don't hold the global lock here! XThreads need to step
// forward (possibly through guarded regions) without worry!
kernel_state_->Save(&stream); kernel_state_->Save(&stream);
memory_->Save(&stream); memory_->Save(&stream);
map->Close(stream.offset()); map->Close(stream.offset());
@ -356,6 +358,8 @@ bool Emulator::SaveToFile(const std::wstring& path) {
} }
bool Emulator::RestoreFromFile(const std::wstring& path) { bool Emulator::RestoreFromFile(const std::wstring& path) {
auto lock = global_critical_region::AcquireDirect();
// Restore the emulator state from a file // Restore the emulator state from a file
auto map = MappedMemory::Open(path, MappedMemory::Mode::kReadWrite); auto map = MappedMemory::Open(path, MappedMemory::Mode::kReadWrite);
if (!map) { if (!map) {