Merge pull request #3980 from JosJuice/changedisc-threading-simplification

DVDInterface: Simplify calling ChangeDisc from CPU thread
This commit is contained in:
Matthew Parlane
2016-07-13 22:48:47 +12:00
committed by GitHub
6 changed files with 25 additions and 24 deletions

View File

@ -472,10 +472,20 @@ static void InsertDiscCallback(u64 userdata, s64 cyclesLate)
delete _FileName; delete _FileName;
} }
void ChangeDisc(const std::string& newFileName) // Can only be called by the host thread
void ChangeDiscAsHost(const std::string& newFileName)
{ {
// WARNING: Can only run on Host Thread
bool was_unpaused = Core::PauseAndLock(true); bool was_unpaused = Core::PauseAndLock(true);
// The host thread is now temporarily the CPU thread
ChangeDiscAsCPU(newFileName);
Core::PauseAndLock(false, was_unpaused);
}
// Can only be called by the CPU thread
void ChangeDiscAsCPU(const std::string& newFileName)
{
std::string* _FileName = new std::string(newFileName); std::string* _FileName = new std::string(newFileName);
CoreTiming::ScheduleEvent(0, s_eject_disc); CoreTiming::ScheduleEvent(0, s_eject_disc);
CoreTiming::ScheduleEvent(500000000, s_insert_disc, (u64)_FileName); CoreTiming::ScheduleEvent(500000000, s_insert_disc, (u64)_FileName);
@ -492,7 +502,6 @@ void ChangeDisc(const std::string& newFileName)
} }
Movie::g_discChange = fileName.substr(sizeofpath); Movie::g_discChange = fileName.substr(sizeofpath);
} }
Core::PauseAndLock(false, was_unpaused);
} }
void SetLidOpen(bool open) void SetLidOpen(bool open)

View File

@ -108,7 +108,8 @@ bool VolumeIsValid();
// Disc detection and swapping // Disc detection and swapping
void SetDiscInside(bool _DiscInside); void SetDiscInside(bool _DiscInside);
bool IsDiscInside(); bool IsDiscInside();
void ChangeDisc(const std::string& fileName); // [NOT THREADSAFE] Host only void ChangeDiscAsHost(const std::string& path); // Can only be called by the host thread
void ChangeDiscAsCPU(const std::string& path); // Can only be called by the CPU thread
// DVD Access Functions // DVD Access Functions
bool ChangePartition(u64 offset); bool ChangePartition(u64 offset);

View File

@ -1210,17 +1210,15 @@ void PlayController(GCPadStatus* PadStatus, int controllerID)
PadStatus->button |= PAD_TRIGGER_R; PadStatus->button |= PAD_TRIGGER_R;
if (s_padState.disc) if (s_padState.disc)
{ {
// This implementation assumes the disc change will only happen once. Trying to change more than // This implementation assumes the disc change will only happen once. Trying
// that will cause // to change more than that will cause it to load the last disc every time.
// it to load the last disc every time. As far as i know though, there are no 3+ disc games, so // As far as I know, there are no 3+ disc games, so this should be fine.
// this should be fine.
CPU::Break();
bool found = false; bool found = false;
std::string path; std::string path;
for (size_t i = 0; i < SConfig::GetInstance().m_ISOFolder.size(); ++i) for (const std::string& iso_folder : SConfig::GetInstance().m_ISOFolder)
{ {
path = SConfig::GetInstance().m_ISOFolder[i]; path = iso_folder + '/' + g_discChange;
if (File::Exists(path + '/' + g_discChange)) if (File::Exists(path))
{ {
found = true; found = true;
break; break;
@ -1228,18 +1226,11 @@ void PlayController(GCPadStatus* PadStatus, int controllerID)
} }
if (found) if (found)
{ {
path += '/' + g_discChange; DVDInterface::ChangeDiscAsCPU(path);
Core::QueueHostJob([=] {
if (!Movie::IsPlayingInput())
return;
DVDInterface::ChangeDisc(path);
CPU::EnableStepping(false);
});
} }
else else
{ {
CPU::Break();
PanicAlertT("Change the disc to %s", g_discChange.c_str()); PanicAlertT("Change the disc to %s", g_discChange.c_str());
} }
} }

View File

@ -132,7 +132,7 @@ void CRenderFrame::OnDropFiles(wxDropFilesEvent& event)
} }
else else
{ {
DVDInterface::ChangeDisc(filepath); DVDInterface::ChangeDiscAsHost(filepath);
} }
} }

View File

@ -691,7 +691,7 @@ void CFrame::DoOpen(bool Boot)
} }
else else
{ {
DVDInterface::ChangeDisc(WxStrToStr(path)); DVDInterface::ChangeDiscAsHost(WxStrToStr(path));
} }
} }

View File

@ -1331,7 +1331,7 @@ void CGameListCtrl::OnChangeDisc(wxCommandEvent& WXUNUSED(event))
const GameListItem* iso = GetSelectedISO(); const GameListItem* iso = GetSelectedISO();
if (!iso || !Core::IsRunning()) if (!iso || !Core::IsRunning())
return; return;
DVDInterface::ChangeDisc(WxStrToStr(iso->GetFileName())); DVDInterface::ChangeDiscAsHost(WxStrToStr(iso->GetFileName()));
} }
void CGameListCtrl::OnSize(wxSizeEvent& event) void CGameListCtrl::OnSize(wxSizeEvent& event)