ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-08 02:05:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

let the expiring things purge be a bit more concurrent

Browse Source
This commit is contained in:
UbitUmarov
2020-08-25 13:11:54 +01:00
parent 0ee1e3b2d9
commit b6d26c89e6
2 changed files with 63 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
OpenSim/Framework/ExpiringCacheOS.cs
View File

@@ -1,6 +1,6 @@
/*
* Copyright (c) 2008, openmetaverse.org, http://opensimulator.org/
* All rights reserved.
* Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders.
*
* - Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
@@ -105,14 +105,13 @@ namespace OpenSim.Framework
private void Purge(object ignored)
{
bool gotLock = false;
int now = (int)(Util.GetTimeStampMS() - m_startTS);
try
{
try { }
finally
{
m_rwLock.EnterWriteLock();
m_rwLock.EnterUpgradeableReadLock();
gotLock = true;
}
@@ -122,26 +121,47 @@ namespace OpenSim.Framework
return;
}
int now = (int)(Util.GetTimeStampMS() - m_startTS);
List<TKey1> expired = new List<TKey1>(m_expireControl.Count);
foreach(KeyValuePair<TKey1, int> kvp in m_expireControl)
{
if(kvp.Value < now)
expired.Add(kvp.Key);
}
foreach(TKey1 key in expired)
if(expired.Count > 0)
{
m_expireControl.Remove(key);
m_values.Remove(key);
bool gotWriteLock = false;
try
{
try { }
finally
{
m_rwLock.EnterWriteLock();
gotWriteLock = true;
}
foreach (TKey1 key in expired)
{
m_expireControl.Remove(key);
m_values.Remove(key);
}
if(m_expireControl.Count == 0)
DisposeTimer();
else
m_purgeTimer.Change(m_expire, Timeout.Infinite);
}
finally
{
if (gotWriteLock)
m_rwLock.ExitWriteLock();
}
}
if(m_expireControl.Count == 0)
DisposeTimer();
else
m_purgeTimer.Change(m_expire, Timeout.Infinite);
}
finally
{
if (gotLock)
m_rwLock.ExitWriteLock();
m_rwLock.ExitUpgradeableReadLock();
}
}

42
OpenSim/Framework/ExpiringKey.cs
View File

@@ -1,6 +1,6 @@
/*
* Copyright (c) 2008, openmetaverse.org, http://opensimulator.org/
* All rights reserved.
* Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders.
*
* - Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
@@ -100,14 +100,13 @@ namespace OpenSim.Framework
private void Purge(object ignored)
{
bool gotLock = false;
int now = (int)(Util.GetTimeStampMS() - m_startTS);
try
{
try { }
finally
{
m_rwLock.EnterWriteLock();
m_rwLock.EnterUpgradeableReadLock();
gotLock = true;
}
@@ -117,23 +116,44 @@ namespace OpenSim.Framework
return;
}
int now = (int)(Util.GetTimeStampMS() - m_startTS);
List<Tkey1> expired = new List<Tkey1>(m_dictionary.Count);
foreach(KeyValuePair<Tkey1,int> kvp in m_dictionary)
{
if(kvp.Value < now)
expired.Add(kvp.Key);
}
foreach(Tkey1 key in expired)
m_dictionary.Remove(key);
if(m_dictionary.Count == 0)
DisposeTimer();
else
m_purgeTimer.Change(m_expire, Timeout.Infinite);
if (expired.Count > 0)
{
bool gotWriteLock = false;
try
{
try { }
finally
{
m_rwLock.EnterWriteLock();
gotWriteLock = true;
}
foreach (Tkey1 key in expired)
m_dictionary.Remove(key);
if(m_dictionary.Count == 0)
DisposeTimer();
else
m_purgeTimer.Change(m_expire, Timeout.Infinite);
}
finally
{
if (gotWriteLock)
m_rwLock.ExitWriteLock();
}
}
}
finally
{
if (gotLock)
m_rwLock.ExitWriteLock();
m_rwLock.ExitUpgradeableReadLock();
}
}