izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

fixed TSAN potential deadlock report by unlocking FTextureFormatManagerModule mutex while loading modules

Browse Source 
#rb danny.couture, charles.bloom

[CL 26518171 by andriy tylychko in ue5-main branch]
This commit is contained in:
andriy tylychko
2023-07-21 13:37:05 -04:00
parent 1744d39e99
commit 7f17257bdb
1 changed files with 29 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
Engine/Source/Developer/TextureFormat/Private/TextureFormatManagerModule.cpp
View File

@@ -84,23 +84,32 @@ public:
TArray<FTextureFormatMetadata> BaseModules;
TArray<FTextureFormatMetadata> ChildModules;
for (int32 Index = 0; Index < Modules.Num(); Index++)
{
if (Modules[Index] != ModuleName) // Avoid our own module when going through this list that was gathered by name
// unlock the mutex to avoid deadlock during module loading: T0 locks ModuleMutex (M0), loads the module and this broadcasts
// FModuleManager::ModulesChangesEvent thread-safe delegate that locks its internal mutex (M1), while T1 loads a module ->
// broadcasts FModuleManager::ModulesChangesEvent (this locks M1) -> FTextureFormatManagerModule::ModulesChangesCallback that
// locks M0. at least it's what TSan reports. this can be a false positive, but there's no need to keep the mutex locked anyway, so it's
// better than just silencing TSan
FScopeUnlock ScopeUnlock(&ModuleMutex);
for (int32 Index = 0; Index < Modules.Num(); Index++)
{
ITextureFormatModule* Module = FModuleManager::LoadModulePtr<ITextureFormatModule>(Modules[Index]);
if (Module)
if (Modules[Index] != ModuleName) // Avoid our own module when going through this list that was gathered by name
{
FTextureFormatMetadata ModuleMeta;
ModuleMeta.Module = Module;
ModuleMeta.ModuleName = Modules[Index];
if ( Module->CanCallGetTextureFormats() )
ITextureFormatModule* Module = FModuleManager::LoadModulePtr<ITextureFormatModule>(Modules[Index]);
if (Module)
{
ChildModules.Add(ModuleMeta);
}
else
{
BaseModules.Add(ModuleMeta);
FTextureFormatMetadata ModuleMeta;
ModuleMeta.Module = Module;
ModuleMeta.ModuleName = Modules[Index];
if (Module->CanCallGetTextureFormats())
{
ChildModules.Add(ModuleMeta);
}
else
{
BaseModules.Add(ModuleMeta);
}
}
}
}
@@ -218,10 +227,13 @@ public:
virtual void Invalidate() override
{
FScopeLock Lock(&ModuleMutex);
// this is called from the constructor
TextureFormatsInitPhase = EInitPhase::Invalidated;
bForceCacheUpdate = true;
{
FScopeLock Lock(&ModuleMutex);
// this is called from the constructor
TextureFormatsInitPhase = EInitPhase::Invalidated;
bForceCacheUpdate = true;
}
GetTextureFormats();
}