piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-06-28 01:49:33 -06:00
Code Issues Packages Projects Releases Wiki Activity

Config: Add locking for config changed callbacks

Browse Source 
Different threads are adding and calling callbacks, so this should have
some locking. This is both to ensure thread safety when accessing
`s_callbacks` and to ensure that there won't be situations where a
callback gets called after it's removed.

`s_callback_guards` is also accessed from multiple threads and has
therefore been made atomic.
This commit is contained in:
JosJuice
2025-04-26 11:13:44 +02:00
parent 805307f432
commit f060baa257
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Core/Common/Config/Config.cpp
View File

@ -20,10 +20,11 @@ using Layers = std::map<LayerType, std::shared_ptr<Layer>>;
static Layers s_layers;
static std::vector<std::pair<ConfigChangedCallbackID, ConfigChangedCallback>> s_callbacks;
static size_t s_next_callback_id = 0;
static u32 s_callback_guards = 0;
static std::atomic<u32> s_callback_guards = 0;
static std::atomic<u64> s_config_version = 0;
static std::shared_mutex s_layers_rw_lock;
static std::mutex s_callbacks_lock;
using ReadLock = std::shared_lock<std::shared_mutex>;
using WriteLock = std::unique_lock<std::shared_mutex>;
@ -69,6 +70,7 @@ void RemoveLayer(LayerType layer)
ConfigChangedCallbackID AddConfigChangedCallback(ConfigChangedCallback func)
{
std::lock_guard lock(s_callbacks_lock);
const ConfigChangedCallbackID callback_id{s_next_callback_id};
++s_next_callback_id;
s_callbacks.emplace_back(std::make_pair(callback_id, std::move(func)));
@ -77,6 +79,7 @@ ConfigChangedCallbackID AddConfigChangedCallback(ConfigChangedCallback func)
void RemoveConfigChangedCallback(ConfigChangedCallbackID callback_id)
{
std::lock_guard lock(s_callbacks_lock);
for (auto it = s_callbacks.begin(); it != s_callbacks.end(); ++it)
{
if (it->first == callback_id)
@ -97,6 +100,8 @@ void OnConfigChanged()
if (s_callback_guards)
return;
std::lock_guard lock(s_callbacks_lock);
for (const auto& callback : s_callbacks)
callback.second();
}