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

Move Progress Dialog Server to named_thread

Browse source 
Make it a global variable, but that can be actually destructed at exit.
This commit is contained in:
Nekotekina 2020-02-28 21:52:09 +03:00
parent 799c3f9708
commit be0e4e9879
1 changed files with 27 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

35
rpcs3/Emu/System.cpp
View file

@ -217,20 +217,32 @@ void Emulator::Init()
// Initialize patch engine // Initialize patch engine
g_fxo->init<patch_engine>()->append(fs::get_config_dir() + "/patch.yml"); g_fxo->init<patch_engine>()->append(fs::get_config_dir() + "/patch.yml");
}
// Initialize progress dialog server (TODO) namespace
if (g_progr.exchange("") == nullptr) {
struct progress_dialog_server
{ {
std::thread server([]() void operator()()
{ {
while (true) while (thread_ctrl::state() != thread_state::aborting)
{ {
// Wait for the start condition // Wait for the start condition
while (!g_progr_ftotal && !g_progr_ptotal) while (!g_progr_ftotal && !g_progr_ptotal)
{ {
if (thread_ctrl::state() == thread_state::aborting)
{
break;
}
std::this_thread::sleep_for(5ms); std::this_thread::sleep_for(5ms);
} }
if (thread_ctrl::state() == thread_state::aborting)
{
break;
}
// Initialize message dialog // Initialize message dialog
std::shared_ptr<MsgDialogBase> dlg = Emu.GetCallbacks().get_msg_dialog(); std::shared_ptr<MsgDialogBase> dlg = Emu.GetCallbacks().get_msg_dialog();
if (dlg) if (dlg)
@ -260,7 +272,7 @@ void Emulator::Init()
u32 value = 0; u32 value = 0;
// Update progress // Update progress
while (true) while (thread_ctrl::state() != thread_state::aborting)
{ {
if (ftotal != g_progr_ftotal || fdone != g_progr_fdone || ptotal != g_progr_ptotal || pdone != g_progr_pdone) if (ftotal != g_progr_ftotal || fdone != g_progr_fdone || ptotal != g_progr_ptotal || pdone != g_progr_pdone)
{ {
@ -307,6 +319,11 @@ void Emulator::Init()
std::this_thread::sleep_for(10ms); std::this_thread::sleep_for(10ms);
} }
if (thread_ctrl::state() == thread_state::aborting)
{
break;
}
// Cleanup // Cleanup
g_progr_ftotal -= fdone; g_progr_ftotal -= fdone;
g_progr_fdone -= fdone; g_progr_fdone -= fdone;
@ -321,10 +338,10 @@ void Emulator::Init()
}); });
} }
} }
}); }
server.detach(); static auto constexpr thread_name = "Progress Dialog Server"sv;
} };
} }
const bool Emulator::SetUsr(const std::string& user) const bool Emulator::SetUsr(const std::string& user)
@ -1769,3 +1786,5 @@ void stx::manual_fixed_typemap<void>::destroy_reporter(const char* name, unsigne
} }
Emulator Emu; Emulator Emu;
named_thread<progress_dialog_server> g_progress_dlg_server;