piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-14 21:37:52 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

DVDInterface: Make changing discs savestate-safe

Browse Source
This commit is contained in:
JosJuice 2016-09-24 17:27:45 +02:00
parent cb759528e0
commit 75dd4d0aee
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Source/Core/Core/HW/DVDInterface.cpp
View File

@ -244,6 +244,8 @@ static CoreTiming::EventType* s_dtk;
static u64 s_last_read_offset; static u64 s_last_read_offset;
static u64 s_last_read_time; static u64 s_last_read_time;
static std::string s_disc_path_to_insert;
static CoreTiming::EventType* s_eject_disc; static CoreTiming::EventType* s_eject_disc;
static CoreTiming::EventType* s_insert_disc; static CoreTiming::EventType* s_insert_disc;
@ -289,6 +291,8 @@ void DoState(PointerWrap& p)
p.Do(s_last_read_offset); p.Do(s_last_read_offset);
p.Do(s_last_read_time); p.Do(s_last_read_time);
p.Do(s_disc_path_to_insert);
p.Do(s_stop_at_track_end); p.Do(s_stop_at_track_end);
DVDThread::DoState(p); DVDThread::DoState(p);
@ -389,6 +393,8 @@ void Init()
s_last_read_offset = 0; s_last_read_offset = 0;
s_last_read_time = 0; s_last_read_time = 0;
s_disc_path_to_insert.clear();
s_eject_disc = CoreTiming::RegisterEvent("EjectDisc", EjectDiscCallback); s_eject_disc = CoreTiming::RegisterEvent("EjectDisc", EjectDiscCallback);
s_insert_disc = CoreTiming::RegisterEvent("InsertDisc", InsertDiscCallback); s_insert_disc = CoreTiming::RegisterEvent("InsertDisc", InsertDiscCallback);
@ -458,16 +464,16 @@ static void EjectDiscCallback(u64 userdata, s64 cyclesLate)
static void InsertDiscCallback(u64 userdata, s64 cyclesLate) static void InsertDiscCallback(u64 userdata, s64 cyclesLate)
{ {
const std::string& old_path = SConfig::GetInstance().m_strFilename; const std::string& old_path = SConfig::GetInstance().m_strFilename;
std::string* new_path = reinterpret_cast<std::string*>(userdata);
if (!SetVolumeName(*new_path)) if (!SetVolumeName(s_disc_path_to_insert))
{ {
// Put back the old one // Put back the old one
SetVolumeName(old_path); SetVolumeName(old_path);
PanicAlertT("Invalid file"); PanicAlertT("The disc that was about to be inserted couldn't be found.");
} }
SetDiscInside(VolumeIsValid()); SetDiscInside(VolumeIsValid());
delete new_path;
s_disc_path_to_insert.clear();
} }
// Can only be called by the host thread // Can only be called by the host thread
@ -484,11 +490,15 @@ void ChangeDiscAsHost(const std::string& new_path)
// Can only be called by the CPU thread // Can only be called by the CPU thread
void ChangeDiscAsCPU(const std::string& new_path) void ChangeDiscAsCPU(const std::string& new_path)
{ {
// TODO: This is bad. Pointers in CoreTiming userdata require if (!s_disc_path_to_insert.empty())
// manual memory management and aren't savestate-safe. {
u64 new_path_pointer = reinterpret_cast<u64>(new std::string(new_path)); PanicAlertT("A disc is already about to be inserted.");
return;
}
s_disc_path_to_insert = new_path;
CoreTiming::ScheduleEvent(0, s_eject_disc); CoreTiming::ScheduleEvent(0, s_eject_disc);
CoreTiming::ScheduleEvent(SystemTimers::GetTicksPerSecond(), s_insert_disc, new_path_pointer); CoreTiming::ScheduleEvent(SystemTimers::GetTicksPerSecond(), s_insert_disc);
Movie::SignalDiscChange(new_path); Movie::SignalDiscChange(new_path);
} }

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

@ -70,7 +70,7 @@ static Common::Event g_compressAndDumpStateSyncEvent;
static std::thread g_save_thread; static std::thread g_save_thread;
// Don't forget to increase this after doing changes on the savestate system // Don't forget to increase this after doing changes on the savestate system
static const u32 STATE_VERSION = 59; // Last changed in PR 3490 static const u32 STATE_VERSION = 60; // Last changed in PR 4242
// Maps savestate versions to Dolphin versions. // Maps savestate versions to Dolphin versions.
// Versions after 42 don't need to be added to this list, // Versions after 42 don't need to be added to this list,