ShuriZma
/
duckstation
mirror of https://github.com/stenzek/duckstation
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

System: Allow host to set async worker count 

For regtest.
This commit is contained in:
Stenzek 2025-01-17 18:57:10 +10:00
parent feeb8d9e56
commit 5dc045eabd
No known key found for this signature in database
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/system.cpp
View File

@ -115,8 +115,6 @@ SystemBootParameters::~SystemBootParameters() = default;
namespace System { namespace System {
static constexpr u32 NUM_ASYNC_WORKER_THREADS = 2;
static constexpr float PRE_FRAME_SLEEP_UPDATE_INTERVAL = 1.0f; static constexpr float PRE_FRAME_SLEEP_UPDATE_INTERVAL = 1.0f;
static constexpr const char FALLBACK_EXE_NAME[] = "PSX.EXE"; static constexpr const char FALLBACK_EXE_NAME[] = "PSX.EXE";
static constexpr u32 MAX_SKIPPED_DUPLICATE_FRAME_COUNT = 2; // 20fps minimum static constexpr u32 MAX_SKIPPED_DUPLICATE_FRAME_COUNT = 2; // 20fps minimum
@ -497,7 +495,7 @@ void System::ProcessShutdown()
CPU::CodeCache::ProcessShutdown(); CPU::CodeCache::ProcessShutdown();
} }
bool System::CPUThreadInitialize(Error* error) bool System::CPUThreadInitialize(Error* error, u32 async_worker_thread_count)
{ {
#ifdef _WIN32 #ifdef _WIN32
// On Win32, we have a bunch of things which use COM (e.g. SDL, Cubeb, etc). // On Win32, we have a bunch of things which use COM (e.g. SDL, Cubeb, etc).
@ -516,7 +514,7 @@ bool System::CPUThreadInitialize(Error* error)
LogStartupInformation(); LogStartupInformation();
s_state.async_task_queue.SetWorkerCount(NUM_ASYNC_WORKER_THREADS); s_state.async_task_queue.SetWorkerCount(async_worker_thread_count);
GPUThread::Internal::ProcessStartup(); GPUThread::Internal::ProcessStartup();

2
src/core/system_private.h
View File

@ -60,7 +60,7 @@ bool ProcessStartup(Error* error);
void ProcessShutdown(); void ProcessShutdown();
/// Called on CPU thread initialization. /// Called on CPU thread initialization.
bool CPUThreadInitialize(Error* error); bool CPUThreadInitialize(Error* error, u32 async_worker_thread_count);
/// Called on CPU thread shutdown. /// Called on CPU thread shutdown.
void CPUThreadShutdown(); void CPUThreadShutdown();

5
src/duckstation-qt/qthost.cpp
View File

@ -77,6 +77,9 @@ LOG_CHANNEL(Host);
static constexpr u32 SETTINGS_VERSION = 3; static constexpr u32 SETTINGS_VERSION = 3;
static constexpr u32 SETTINGS_SAVE_DELAY = 1000; static constexpr u32 SETTINGS_SAVE_DELAY = 1000;
/// Use two async worker threads, should be enough for most tasks.
static constexpr u32 NUM_ASYNC_WORKER_THREADS = 2;
/// Interval at which the controllers are polled when the system is not active. /// Interval at which the controllers are polled when the system is not active.
static constexpr u32 BACKGROUND_CONTROLLER_POLLING_INTERVAL = 100; static constexpr u32 BACKGROUND_CONTROLLER_POLLING_INTERVAL = 100;
@ -1841,7 +1844,7 @@ void EmuThread::run()
// input source setup must happen on emu thread // input source setup must happen on emu thread
{ {
Error startup_error; Error startup_error;
if (!System::CPUThreadInitialize(&startup_error)) if (!System::CPUThreadInitialize(&startup_error, NUM_ASYNC_WORKER_THREADS))
{ {
moveToThread(m_ui_thread); moveToThread(m_ui_thread);
Host::ReportFatalError("Fatal Startup Error", startup_error.GetDescription()); Host::ReportFatalError("Fatal Startup Error", startup_error.GetDescription());

3
src/duckstation-regtest/regtest_host.cpp
View File

@ -813,7 +813,8 @@ int main(int argc, char* argv[])
if (!RegTestHost::SetNewDataRoot(autoboot->filename)) if (!RegTestHost::SetNewDataRoot(autoboot->filename))
return EXIT_FAILURE; return EXIT_FAILURE;
if (!System::CPUThreadInitialize(&startup_error)) // Only one async worker.
if (!System::CPUThreadInitialize(&startup_error, 1))
{ {
ERROR_LOG("CPUThreadInitialize() failed: {}", startup_error.GetDescription()); ERROR_LOG("CPUThreadInitialize() failed: {}", startup_error.GetDescription());
return EXIT_FAILURE; return EXIT_FAILURE;