birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Image Gradient: Switch to shared_mutex (#6558)

Browse Source 
* Improve lock contention by switching to a shared_lock.
ImageGradient is accessed via a many-reader-one-writer pattern, so a shared_lock causes less contention in the common "read" case.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Remove chatty profile marker.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
This commit is contained in:
Mike Balfour
2021-12-23 14:16:22 -06:00
committed by GitHub
parent f1a1cb3ec0
commit 3e9b76cdee
3 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/GradientSignal/Code/Include/GradientSignal/GradientSampler.h
-2
View File
@@ -88,8 +88,6 @@ namespace GradientSignal
inline float GradientSampler::GetValue(const GradientSampleParams& sampleParams) const
{
AZ_PROFILE_FUNCTION(Entity);
if (m_opacity <= 0.0f || !m_gradientId.IsValid())
{
return 0.0f;
Gems/GradientSignal/Code/Source/Components/ImageGradientComponent.cpp
+7 -7
View File
@@ -135,7 +135,7 @@ namespace GradientSignal
GradientRequestBus::Handler::BusConnect(GetEntityId());
AZ::Data::AssetBus::Handler::BusConnect(m_configuration.m_imageAsset.GetId());
AZStd::lock_guard<decltype(m_imageMutex)> imageLock(m_imageMutex);
AZStd::unique_lock<decltype(m_imageMutex)> imageLock(m_imageMutex);
m_configuration.m_imageAsset.QueueLoad();
}
@@ -147,7 +147,7 @@ namespace GradientSignal
m_dependencyMonitor.Reset();
AZStd::lock_guard<decltype(m_imageMutex)> imageLock(m_imageMutex);
AZStd::unique_lock<decltype(m_imageMutex)> imageLock(m_imageMutex);
m_configuration.m_imageAsset.Release();
}
@@ -173,19 +173,19 @@ namespace GradientSignal
void ImageGradientComponent::OnAssetReady(AZ::Data::Asset<AZ::Data::AssetData> asset)
{
AZStd::lock_guard<decltype(m_imageMutex)> imageLock(m_imageMutex);
AZStd::unique_lock<decltype(m_imageMutex)> imageLock(m_imageMutex);
m_configuration.m_imageAsset = asset;
}
void ImageGradientComponent::OnAssetMoved(AZ::Data::Asset<AZ::Data::AssetData> asset, [[maybe_unused]] void* oldDataPointer)
{
AZStd::lock_guard<decltype(m_imageMutex)> imageLock(m_imageMutex);
AZStd::unique_lock<decltype(m_imageMutex)> imageLock(m_imageMutex);
m_configuration.m_imageAsset = asset;
}
void ImageGradientComponent::OnAssetReloaded(AZ::Data::Asset<AZ::Data::AssetData> asset)
{
AZStd::lock_guard<decltype(m_imageMutex)> imageLock(m_imageMutex);
AZStd::unique_lock<decltype(m_imageMutex)> imageLock(m_imageMutex);
m_configuration.m_imageAsset = asset;
}
@@ -200,7 +200,7 @@ namespace GradientSignal
if (!wasPointRejected)
{
AZStd::lock_guard<decltype(m_imageMutex)> imageLock(m_imageMutex);
AZStd::shared_lock<decltype(m_imageMutex)> imageLock(m_imageMutex);
return GetValueFromImageAsset(m_configuration.m_imageAsset, uvw, m_configuration.m_tilingX, m_configuration.m_tilingY, 0.0f);
}
@@ -223,7 +223,7 @@ namespace GradientSignal
AZ::Data::AssetBus::Handler::BusDisconnect(m_configuration.m_imageAsset.GetId());
{
AZStd::lock_guard<decltype(m_imageMutex)> imageLock(m_imageMutex);
AZStd::unique_lock<decltype(m_imageMutex)> imageLock(m_imageMutex);
m_configuration.m_imageAsset = AZ::Data::AssetManager::Instance().FindOrCreateAsset(assetId, azrtti_typeid<ImageAsset>(), m_configuration.m_imageAsset.GetAutoLoadBehavior());
}
Gems/GradientSignal/Code/Source/Components/ImageGradientComponent.h
+1 -1
View File
@@ -94,6 +94,6 @@ namespace GradientSignal
private:
ImageGradientConfig m_configuration;
LmbrCentral::DependencyMonitor m_dependencyMonitor;
mutable AZStd::recursive_mutex m_imageMutex;
mutable AZStd::shared_mutex m_imageMutex;
};
}