archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-10 08:51:28 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove g_thread_count

Browse source 
Unnecessary global which is bad to reason about.
Possibly fix a but in SPRX loader.
This commit is contained in:
Nekotekina 2019-10-12 16:42:44 +03:00
parent 49e96b39dd
commit 8e21f4d5d4
2 changed files with 8 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

21
rpcs3/Emu/System.cpp
View file

@ -54,8 +54,6 @@ bool g_use_rtm;
std::string g_cfg_defaults;
extern atomic_t<u32> g_thread_count;
extern void ppu_load_exec(const ppu_exec_object&);
extern void spu_load_exec(const spu_exec_object&);
extern void ppu_initialize(const ppu_module&);
@ -1148,6 +1146,8 @@ void Emulator::Load(const std::string& title_id, bool add_only, bool force_globa
g_progr = "Compiling PPU modules";
atomic_t<u32> worker_count = 0;
for (std::size_t i = 0; i < file_queue.size(); i++)
{
const auto& path = file_queue[i].first;
@ -1169,16 +1169,19 @@ void Emulator::Load(const std::string& title_id, bool add_only, bool force_globa
{
if (auto prx = ppu_load_prx(obj, path))
{
while (g_thread_count >= max_threads + 2)
worker_count++;
while (worker_count > max_threads)
{
std::this_thread::sleep_for(10ms);
}
thread_queue.emplace("Worker " + std::to_string(thread_queue.size()), [_prx = std::move(prx)]
thread_queue.emplace("Worker " + std::to_string(thread_queue.size()), [_prx = std::move(prx), &worker_count]
{
ppu_initialize(*_prx);
ppu_unload_prx(*_prx);
g_progr_fdone++;
worker_count--;
});
continue;
@ -1788,17 +1791,9 @@ void Emulator::Stop(bool restart)
GetCallbacks().on_stop();
cpu_thread::stop_all();
while (g_thread_count)
{
std::this_thread::sleep_for(10ms);
}
LOG_NOTICE(GENERAL, "All threads stopped...");
g_fxo->reset();
lv2_obj::cleanup();
idm::clear();
g_fxo->reset();
LOG_NOTICE(GENERAL, "Objects cleared...");