mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-31 09:33:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Core/State: Minor cleanup around the undo load state buffer.

Browse Source
This commit is contained in:
Admiral H. Curtiss 2022-04-05 02:15:03 +02:00
parent e0d30e371c
commit f3a23db0e0
No known key found for this signature in database
GPG Key ID: F051B4C4044F33FB
1 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
Source/Core/Core/State.cpp
View File

@ -66,10 +66,10 @@ static HEAP_ALLOC(wrkmem, LZO1X_1_MEM_COMPRESS);
static AfterLoadCallbackFunc s_on_after_load_callback; static AfterLoadCallbackFunc s_on_after_load_callback;
// Temporary undo state buffer // Temporary undo state buffer
static std::vector<u8> g_undo_load_buffer; static std::vector<u8> s_undo_load_buffer;
static std::mutex s_load_or_save_in_progress_mutex; static std::mutex s_undo_load_buffer_mutex;
static std::mutex g_cs_undo_load_buffer; static std::mutex s_load_or_save_in_progress_mutex;
struct CompressAndDumpState_args struct CompressAndDumpState_args
{ {
@ -650,12 +650,13 @@ void LoadAs(const std::string& filename)
// Save temp buffer for undo load state // Save temp buffer for undo load state
if (!Movie::IsJustStartingRecordingInputFromSaveState()) if (!Movie::IsJustStartingRecordingInputFromSaveState())
{ {
std::lock_guard lk2(g_cs_undo_load_buffer); std::lock_guard lk2(s_undo_load_buffer_mutex);
SaveToBuffer(g_undo_load_buffer); SaveToBuffer(s_undo_load_buffer);
const std::string dtmpath = File::GetUserPath(D_STATESAVES_IDX) + "undo.dtm";
if (Movie::IsMovieActive()) if (Movie::IsMovieActive())
Movie::SaveRecording(File::GetUserPath(D_STATESAVES_IDX) + "undo.dtm"); Movie::SaveRecording(dtmpath);
else if (File::Exists(File::GetUserPath(D_STATESAVES_IDX) + "undo.dtm")) else if (File::Exists(dtmpath))
File::Delete(File::GetUserPath(D_STATESAVES_IDX) + "undo.dtm"); File::Delete(dtmpath);
} }
bool loaded = false; bool loaded = false;
@ -734,8 +735,8 @@ void Shutdown()
// this gives a better guarantee to free the allocated memory right NOW (as opposed to, actually, // this gives a better guarantee to free the allocated memory right NOW (as opposed to, actually,
// never) // never)
{ {
std::lock_guard lk(g_cs_undo_load_buffer); std::lock_guard lk(s_undo_load_buffer_mutex);
std::vector<u8>().swap(g_undo_load_buffer); std::vector<u8>().swap(s_undo_load_buffer);
} }
} }
@ -789,18 +790,25 @@ void SaveFirstSaved()
// Load the last state before loading the state // Load the last state before loading the state
void UndoLoadState() void UndoLoadState()
{ {
std::lock_guard lk(g_cs_undo_load_buffer); std::lock_guard lk(s_undo_load_buffer_mutex);
if (!g_undo_load_buffer.empty()) if (!s_undo_load_buffer.empty())
{ {
if (File::Exists(File::GetUserPath(D_STATESAVES_IDX) + "undo.dtm") || (!Movie::IsMovieActive())) if (Movie::IsMovieActive())
{ {
LoadFromBuffer(g_undo_load_buffer); const std::string dtmpath = File::GetUserPath(D_STATESAVES_IDX) + "undo.dtm";
if (Movie::IsMovieActive()) if (File::Exists(dtmpath))
Movie::LoadInput(File::GetUserPath(D_STATESAVES_IDX) + "undo.dtm"); {
LoadFromBuffer(s_undo_load_buffer);
Movie::LoadInput(dtmpath);
}
else
{
PanicAlertFmtT("No undo.dtm found, aborting undo load state to prevent movie desyncs");
}
} }
else else
{ {
PanicAlertFmtT("No undo.dtm found, aborting undo load state to prevent movie desyncs"); LoadFromBuffer(s_undo_load_buffer);
} }
} }
else else