archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-12 17:58:37 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fixup Savestate Segfault

Browse source
This commit is contained in:
Elad Ashkenazi 2024-03-24 20:05:10 +02:00
parent 2e824827b7
commit 453a3c4852
6 changed files with 33 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

22
rpcs3/Emu/System.cpp
View file

@ -43,6 +43,7 @@
#include "../Crypto/unself.h"
#include "../Crypto/unzip.h"
#include "util/logs.hpp"
#include "util/init_mutex.hpp"
#include <fstream>
#include <memory>
@ -2970,10 +2971,12 @@ void Emulator::Kill(bool allow_autoexit, bool savestate, savestate_stage* save_s
*join_thread = make_ptr(new named_thread("Emulation Join Thread"sv, [join_thread, savestate, allow_autoexit, this]() mutable
{
fs::pending_file file;
std::shared_ptr<stx::init_mutex> init_mtx = std::make_shared<stx::init_mutex>();
std::shared_ptr<bool> join_ended = std::make_shared<bool>(false);
atomic_ptr<utils::serial> to_ar;
named_thread stop_watchdog("Stop Watchdog"sv, [&to_ar, join_ended, this]()
named_thread stop_watchdog("Stop Watchdog"sv, [&to_ar, init_mtx, join_ended, this]()
{
const auto closed_sucessfully = std::make_shared<atomic_t<bool>>(false);
@ -3008,7 +3011,7 @@ void Emulator::Kill(bool allow_autoexit, bool savestate, savestate_stage* save_s
if (auto ar_ptr = to_ar.load())
{
// Total amount of waiting: about 10s
GetCallbacks().on_save_state_progress(closed_sucessfully, ar_ptr);
GetCallbacks().on_save_state_progress(closed_sucessfully, ar_ptr, init_mtx);
while (thread_ctrl::state() != thread_state::aborting)
{
@ -3040,9 +3043,10 @@ void Emulator::Kill(bool allow_autoexit, bool savestate, savestate_stage* save_s
sys_log.notice("All threads have been stopped.");
fs::pending_file file;
std::string path;
static_cast<void>(init_mtx->init());
while (savestate)
{
path = get_savestate_file(m_title_id, m_path, 0, 0);
@ -3068,8 +3072,9 @@ void Emulator::Kill(bool allow_autoexit, bool savestate, savestate_stage* save_s
break;
}
to_ar = stx::make_single<utils::serial>();
to_ar.load()->m_file_handler = make_compressed_serialization_file_handler(file.file);
auto serial_ptr = stx::make_single<utils::serial>();
serial_ptr->m_file_handler = make_compressed_serialization_file_handler(file.file);
to_ar = std::move(serial_ptr);
signal_system_cache_can_stay();
break;
@ -3235,6 +3240,9 @@ void Emulator::Kill(bool allow_autoexit, bool savestate, savestate_stage* save_s
}
}
stop_watchdog = thread_state::finished;
static_cast<void>(init_mtx->reset());
if (savestate)
{
auto& ar = *to_ar.load();
@ -3273,12 +3281,8 @@ void Emulator::Kill(bool allow_autoexit, bool savestate, savestate_stage* save_s
m_path = path;
}
}
ar.set_reading_state();
}
stop_watchdog = thread_state::aborting;
// Log additional debug information - do not do it on the main thread due to the concern of halting UI events
if (g_tty && sys_log.notice)