ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 01:35:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

also expire flotsam assets weakreferences

Browse Source
This commit is contained in:
UbitUmarov
2024-04-06 21:54:36 +01:00
parent 1e424be6f3
commit 50f818c480
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
View File

@@ -352,10 +352,11 @@ namespace OpenSim.Region.CoreModules.Asset
{
lock(weakAssetReferencesLock)
{
if(weakAssetReferences.TryGetValue(key , out WeakReference aref))
ref WeakReference aref = ref CollectionsMarshal.GetValueRefOrAddDefault(weakAssetReferences, key, out bool ex);
if(ex)
aref.Target = asset;
else
weakAssetReferences[key] = new WeakReference(asset);
aref = new WeakReference(asset);
}
}
@@ -463,20 +464,18 @@ namespace OpenSim.Region.CoreModules.Asset
private AssetBase GetFromWeakReference(string id)
{
AssetBase asset = null;
lock(weakAssetReferencesLock)
{
if (weakAssetReferences.TryGetValue(id, out WeakReference aref))
{
asset = aref.Target as AssetBase;
if(asset is null)
weakAssetReferences.Remove(id);
else
if (aref.Target is AssetBase asset)
{
m_weakRefHits++;
return asset;
}
}
}
return asset;
return null;
}
/// <summary>
@@ -793,6 +792,9 @@ namespace OpenSim.Region.CoreModules.Asset
// Purge all files last accessed prior to this point
DoCleanExpiredFiles(DateTime.Now - m_FileExpiration);
lock (weakAssetReferencesLock)
weakAssetReferences = new Dictionary<string, WeakReference>();
}
private void DoCleanExpiredFiles(DateTime purgeLine)