Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix ppu progress dialog percentage #9692

Merged
merged 3 commits into from Jan 31, 2021
Merged

Fix ppu progress dialog percentage #9692

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e3c8f69
Fix potential crash of progress dialog
elad335 Jan 31, 2021
382f881
Fix ppu progress dialog percentage
elad335 Jan 31, 2021
1cd045d
Add missing destructor of progress dialog
elad335 Jan 31, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 13 additions & 4 deletions rpcs3/Emu/System.cpp
View file
Open in desktop
Expand Up @@ -78,7 +78,7 @@ std::array<std::deque<std::string>, 16> g_tty_input;
std::mutex g_tty_mutex;

// Progress display server synchronization variables
atomic_t<const char*> g_progr{nullptr};
atomic_t<const char*> g_progr{""};
atomic_t<u32> g_progr_ftotal{0};
atomic_t<u32> g_progr_fdone{0};
atomic_t<u32> g_progr_ptotal{0};
Expand Down Expand Up @@ -385,9 +385,10 @@ namespace
pdone = pdone_new;

// Compute new progress in percents
const u32 total = ftotal + ptotal;
const u32 done = fdone + pdone;
const double value = double(done) * 100. / double(total ? total : 1);
// Assume not all programs were found if files were not compiled (as it may contain more)
const u64 total = std::max<u64>(ptotal, 1) * std::max<u64>(ftotal, 1);
const u64 done = pdone * std::max<u64>(fdone, 1);
const double value = std::fmin(done * 100. / total, 100.);

// Changes detected, send update
Emu.CallAfter([=]()
Expand Down Expand Up @@ -438,6 +439,14 @@ namespace
}
}

~progress_dialog_server()
{
g_progr_ftotal.release(0);
g_progr_fdone.release(0);
g_progr_ptotal.release(0);
g_progr_pdone.release(0);
}

static auto constexpr thread_name = "Progress Dialog Server"sv;
};
}
Expand Down