OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Another go at the deadlock: not locking TryGetValue, and just catch/ignore exceptions.

prioritization
Diva Canto 2009-10-07 19:45:57 -07:00
parent 29f03d95f3
commit dd80380df5
1 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
OpenSim/Region/ClientStack/LindenUDP/LLUDPClientCollection.cs
View File

@ -215,33 +215,49 @@ namespace OpenSim.Region.ClientStack.LindenUDP
public bool TryGetValue(UUID key, out LLUDPClient value) public bool TryGetValue(UUID key, out LLUDPClient value)
{ {
//bool success; ////bool success;
//bool doLock = !rwLock.IsUpgradeableReadLockHeld; ////bool doLock = !rwLock.IsUpgradeableReadLockHeld;
//if (doLock) rwLock.EnterReadLock(); ////if (doLock) rwLock.EnterReadLock();
//try { success = Dictionary1.TryGetValue(key, out value); } ////try { success = Dictionary1.TryGetValue(key, out value); }
//finally { if (doLock) rwLock.ExitReadLock(); } ////finally { if (doLock) rwLock.ExitReadLock(); }
//return success; ////return success;
lock (m_sync) //lock (m_sync)
return Dictionary1.TryGetValue(key, out value); // return Dictionary1.TryGetValue(key, out value);
try
{
return Dictionary1.TryGetValue(key, out value);
}
catch { }
value = null;
return false;
} }
public bool TryGetValue(IPEndPoint key, out LLUDPClient value) public bool TryGetValue(IPEndPoint key, out LLUDPClient value)
{ {
//bool success; ////bool success;
//bool doLock = !rwLock.IsUpgradeableReadLockHeld; ////bool doLock = !rwLock.IsUpgradeableReadLockHeld;
//if (doLock) rwLock.EnterReadLock(); ////if (doLock) rwLock.EnterReadLock();
//try { success = Dictionary2.TryGetValue(key, out value); } ////try { success = Dictionary2.TryGetValue(key, out value); }
//finally { if (doLock) rwLock.ExitReadLock(); } ////finally { if (doLock) rwLock.ExitReadLock(); }
//return success; ////return success;
lock (m_sync) //lock (m_sync)
// return Dictionary2.TryGetValue(key, out value);
try
{
return Dictionary2.TryGetValue(key, out value); return Dictionary2.TryGetValue(key, out value);
}
catch { }
value = null;
return false;
} }
public void ForEach(Action<LLUDPClient> action) public void ForEach(Action<LLUDPClient> action)