the project root and engine root to fix issues with running the Editor
or AssetProcessor from within the project folder overriding the
project_path with the engine root bootstrap.cfg project_path entry
The order in which the project path is overridden as follows
1. The <engine-root>/bootstrap.cfg is first merged into the Settings
Registry. Any '/Amazon/AzCore/Bootstrap/project_path' would be used
if the following steps don't override that key.
2. Followed by general *.setreg/*.setregpatch files being merged into
the Settings Registry which can override the
'/Amazon/AzCore/Bootstrap/project_path' key
3. Next a project.json file searched upwards from the current executable
directory to determine the project path
4. Finally if a command line parameter that overrides the project path
is supplied it is used instead
I wasn't able to reproduce the deadlock, but from the reported callstack, the following lock inversion happens:
* EditorSurfaceDataSystemComponent::OnCatalogLoaded locked the AssetCatalogRequestBus mutex by calling EnumerateAssets, and then locked m_assetMutex inside GetAsset->FindOrCreateAsset inside the enumerate callback.
* Loading threads would lock m_assetMutex in AssetManager::ValidateAndRegisterAssetLoading, then lock the AssetCatalogRequestBus inside the Asset<T> copy constructor when calling UpdateDebugStatus when the constructor calls SetData->UpgradeAssetInfo->UpdateAssetInfo->AssetCatalogRequestBus::GetAssetInfoById
This should solve the lock inversion on both sides of the problem:
* UpdateDebugStatus now takes in a const ref instead of a copy, so the copy constructor isn't called.
* EditorSurfaceDataSystemComponent::OnCatalogLoaded is rewritten to call GetAsset outside of the enumeration call.
As a bonus, this also removes the blocking load call. The rest of the code already supports asynchronous refreshes as the list assets are added / modified / removed, so this code was changed to leverage the asynchronous refreshes as well.
amzn-sean
hultonha
hasareej
sphrose
greerdv
mcgarrah
srikappa
karlberg
kberg-amzn
pereslav
srikappa-amzn
Terry Michaels
Nicholas Van Sickle
SergeyAMZN
Chris Galvan
Esteban Papp
Mike Balfour
jackalbe
alexpete
mbalfour