piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 22:59:47 -06:00
Code Issues Packages Projects Releases Wiki Activity

VideoCommon: add additional locks around asset access and usage to ensure thread safety

Browse Source
This commit is contained in:
iwubcode
2023-06-04 23:01:29 -05:00
parent ce2b63dcc0
commit 9d7ab47738
7 changed files with 92 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Core/VideoCommon/Assets/CustomAssetLoader.cpp
View File

@ -30,7 +30,7 @@ void CustomAssetLoader::Init()
std::this_thread::sleep_for(TIME_BETWEEN_ASSET_MONITOR_CHECKS);
std::lock_guard lk(m_assets_lock);
std::lock_guard lk(m_asset_load_lock);
for (auto& [asset_id, asset_to_monitor] : m_assets_to_monitor)
{
if (auto ptr = asset_to_monitor.lock())
@ -50,11 +50,11 @@ void CustomAssetLoader::Init()
{
if (ptr->Load())
{
if (m_max_memory_available >= m_total_bytes_loaded + ptr->GetByteSizeInMemory())
std::lock_guard lk(m_asset_load_lock);
const std::size_t asset_memory_size = ptr->GetByteSizeInMemory();
if (m_max_memory_available >= m_total_bytes_loaded + asset_memory_size)
{
m_total_bytes_loaded += ptr->GetByteSizeInMemory();
std::lock_guard lk(m_assets_lock);
m_total_bytes_loaded += asset_memory_size;
m_assets_to_monitor.try_emplace(ptr->GetAssetId(), ptr);
}
else