piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-25 15:19:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

Core: Use MoveOnlyFunction for RunOnCPUThread.

Browse Source
This commit is contained in:
Jordan Woyak
2025-04-27 19:53:20 -05:00
parent 37aa65afc4
commit 4ec2072beb
4 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/Core/Core.cpp
View File

@ -809,7 +809,8 @@ static bool PauseAndLock(Core::System& system, bool do_lock, bool unpause_on_unl
return was_unpaused; return was_unpaused;
} }
void RunOnCPUThread(Core::System& system, std::function<void()> function, bool wait_for_completion) void RunOnCPUThread(Core::System& system, Common::MoveOnlyFunction<void()> function,
bool wait_for_completion)
{ {
// If the CPU thread is not running, assume there is no active CPU thread we can race against. // If the CPU thread is not running, assume there is no active CPU thread we can race against.
if (!IsRunning(system) || IsCPUThread()) if (!IsRunning(system) || IsCPUThread())

4
Source/Core/Core/Core.h
View File

@ -15,6 +15,7 @@
#include <string_view> #include <string_view>
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "Common/Functional.h"
struct BootParameters; struct BootParameters;
struct WindowSystemInfo; struct WindowSystemInfo;
@ -159,7 +160,8 @@ void OnFrameEnd(Core::System& system);
// Run a function on the CPU thread, asynchronously. // Run a function on the CPU thread, asynchronously.
// This is only valid to call from the host thread, since it uses PauseAndLock() internally. // This is only valid to call from the host thread, since it uses PauseAndLock() internally.
void RunOnCPUThread(Core::System& system, std::function<void()> function, bool wait_for_completion); void RunOnCPUThread(Core::System& system, Common::MoveOnlyFunction<void()> function,
bool wait_for_completion);
// for calling back into UI code without introducing a dependency on it in core // for calling back into UI code without introducing a dependency on it in core
using StateChangedCallbackFunc = std::function<void(Core::State)>; using StateChangedCallbackFunc = std::function<void(Core::State)>;

4
Source/Core/Core/HW/CPU.cpp
View File

@ -60,7 +60,7 @@ void CPUManager::ExecutePendingJobs(std::unique_lock<std::mutex>& state_lock)
{ {
while (!m_pending_jobs.empty()) while (!m_pending_jobs.empty())
{ {
auto callback = m_pending_jobs.front(); auto callback = std::move(m_pending_jobs.front());
m_pending_jobs.pop(); m_pending_jobs.pop();
state_lock.unlock(); state_lock.unlock();
callback(); callback();
@ -414,7 +414,7 @@ bool CPUManager::PauseAndLock(bool do_lock, bool unpause_on_unlock, bool control
return was_unpaused; return was_unpaused;
} }
void CPUManager::AddCPUThreadJob(std::function<void()> function) void CPUManager::AddCPUThreadJob(Common::MoveOnlyFunction<void()> function)
{ {
std::unique_lock state_lock(m_state_change_lock); std::unique_lock state_lock(m_state_change_lock);
m_pending_jobs.push(std::move(function)); m_pending_jobs.push(std::move(function));

6
Source/Core/Core/HW/CPU.h
View File

@ -4,11 +4,11 @@
#pragma once #pragma once
#include <condition_variable> #include <condition_variable>
#include <functional>
#include <mutex> #include <mutex>
#include <queue> #include <queue>
#include "Common/Event.h" #include "Common/Event.h"
#include "Common/Functional.h"
namespace Common namespace Common
{ {
@ -99,7 +99,7 @@ public:
// Adds a job to be executed during on the CPU thread. This should be combined with // Adds a job to be executed during on the CPU thread. This should be combined with
// PauseAndLock(), as while the CPU is in the run loop, it won't execute the function. // PauseAndLock(), as while the CPU is in the run loop, it won't execute the function.
void AddCPUThreadJob(std::function<void()> function); void AddCPUThreadJob(Common::MoveOnlyFunction<void()> function);
private: private:
void FlushStepSyncEventLocked(); void FlushStepSyncEventLocked();
@ -135,7 +135,7 @@ private:
bool m_state_system_request_stepping = false; bool m_state_system_request_stepping = false;
bool m_state_cpu_step_instruction = false; bool m_state_cpu_step_instruction = false;
Common::Event* m_state_cpu_step_instruction_sync = nullptr; Common::Event* m_state_cpu_step_instruction_sync = nullptr;
std::queue<std::function<void()>> m_pending_jobs; std::queue<Common::MoveOnlyFunction<void()>> m_pending_jobs;
Common::Event m_time_played_finish_sync; Common::Event m_time_played_finish_sync;
Core::System& m_system; Core::System& m_system;