ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-09 18:55:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Changed locks to prevent deadlocks (especially during multi-region Load OAR)

Browse Source
This commit is contained in:
Oren Hurvitz
2012-08-09 14:51:05 +03:00
committed by Justin Clark-Casey (justincc)
parent d2f4ca0dfe
commit 9784e4e07d
3 changed files with 61 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
View File

@@ -604,13 +604,18 @@ namespace OpenSim.Region.CoreModules.World.Archiver
/// <returns></returns>
private bool ResolveUserUuid(Scene scene, UUID uuid)
{
if (!m_validUserUuids.ContainsKey(uuid))
lock (m_validUserUuids)
{
UserAccount account = scene.UserAccountService.GetUserAccount(scene.RegionInfo.ScopeID, uuid);
m_validUserUuids.Add(uuid, account != null);
}
if (!m_validUserUuids.ContainsKey(uuid))
{
// Note: we call GetUserAccount() inside the lock because this UserID is likely
// to occur many times, and we only want to query the users service once.
UserAccount account = scene.UserAccountService.GetUserAccount(scene.RegionInfo.ScopeID, uuid);
m_validUserUuids.Add(uuid, account != null);
}
return m_validUserUuids[uuid];
return m_validUserUuids[uuid];
}
}
/// <summary>
@@ -623,19 +628,26 @@ namespace OpenSim.Region.CoreModules.World.Archiver
if (uuid == UUID.Zero)
return true; // this means the object has no group
if (!m_validGroupUuids.ContainsKey(uuid))
lock (m_validGroupUuids)
{
bool exists;
if (m_groupsModule == null)
exists = false;
else
exists = (m_groupsModule.GetGroupRecord(uuid) != null);
if (!m_validGroupUuids.ContainsKey(uuid))
{
bool exists;
if (m_groupsModule == null)
{
exists = false;
}
else
{
// Note: we call GetGroupRecord() inside the lock because this GroupID is likely
// to occur many times, and we only want to query the groups service once.
exists = (m_groupsModule.GetGroupRecord(uuid) != null);
}
m_validGroupUuids.Add(uuid, exists);
}
m_validGroupUuids.Add(uuid, exists);
return m_validGroupUuids[uuid];
}
return m_validGroupUuids[uuid];
}
/// Load an asset