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

Progress Dialog: Fix race on PPU compilation status

Browse source
This commit is contained in:
Eladash 2023-08-21 19:14:21 +03:00 • committed by Elad Ashkenazi
parent 36dce454dd
commit a001e6ef09
6 changed files with 74 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

10
rpcs3/Emu/system_progress.cpp
View file

@ -11,7 +11,7 @@
LOG_CHANNEL(sys_log, "SYS");
// Progress display server synchronization variables
atomic_t<const char*> g_progr{nullptr};
atomic_t<progress_dialog_string_t> g_progr{};
atomic_t<u32> g_progr_ftotal{0};
atomic_t<u32> g_progr_fdone{0};
atomic_t<u32> g_progr_ptotal{0};
@ -40,7 +40,7 @@ void progress_dialog_server::operator()()
while (!g_system_progress_stopping && thread_ctrl::state() != thread_state::aborting)
{
// Wait for the start condition
auto text0 = +g_progr;
const char* text0 = g_progr.load();
while (!text0)
{
@ -50,7 +50,7 @@ void progress_dialog_server::operator()()
}
thread_ctrl::wait_for(5000);
text0 = +g_progr;
text0 = g_progr.load();
}
if (g_system_progress_stopping || thread_ctrl::state() == thread_state::aborting)
@ -120,7 +120,7 @@ void progress_dialog_server::operator()()
// Update progress
while (!g_system_progress_stopping && thread_ctrl::state() != thread_state::aborting)
{
const auto text_new = g_progr.load();
const auto text_new = +g_progr.load();
const u32 ftotal_new = g_progr_ftotal;
const u32 fdone_new = g_progr_fdone;
@ -239,5 +239,5 @@ progress_dialog_server::~progress_dialog_server()
g_progr_fdone.release(0);
g_progr_ptotal.release(0);
g_progr_pdone.release(0);
g_progr.release(nullptr);
g_progr.release(progress_dialog_string_t{});
}