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

* Increasing ScenePresences locking to prevent race conditions such as those seen in one of the crashes of mantis 1163

Browse Source 
* It's not impossible that this could lead to deadlock where sessions simply appear to freeze, even though the region console still responds.
* If this is the case, please file a mantis
This commit is contained in:
Justin Clarke Casey
2008-05-07 22:59:30 +00:00
parent 95fbf63b3b
commit be02107ea8
3 changed files with 129 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
OpenSim/Region/Environment/Scenes/InnerScene.cs
View File

@@ -116,7 +116,11 @@ namespace OpenSim.Region.Environment.Scenes
public void Close()
{
ScenePresences.Clear();
lock (ScenePresences)
{
ScenePresences.Clear();
}
//SceneObjects.Clear();
Entities.Clear();
}
@@ -792,6 +796,8 @@ namespace OpenSim.Region.Environment.Scenes
/// <returns></returns>
public List<ScenePresence> GetScenePresences(FilterAvatarList filter)
{
// No locking of scene presences here since we're passing back a list...
List<ScenePresence> result = new List<ScenePresence>();
List<ScenePresence> ScenePresencesList = GetScenePresences();
@@ -813,9 +819,12 @@ namespace OpenSim.Region.Environment.Scenes
/// <returns>null if the agent was not found</returns>
public ScenePresence GetScenePresence(LLUUID agentID)
{
if (ScenePresences.ContainsKey(agentID))
lock (ScenePresences)
{
return ScenePresences[agentID];
if (ScenePresences.ContainsKey(agentID))
{
return ScenePresences[agentID];
}
}
return null;
@@ -917,16 +926,19 @@ namespace OpenSim.Region.Environment.Scenes
internal bool TryGetAvatarByName(string avatarName, out ScenePresence avatar)
{
foreach (ScenePresence presence in ScenePresences.Values)
lock (ScenePresences)
{
if (!presence.IsChildAgent)
foreach (ScenePresence presence in ScenePresences.Values)
{
string name = presence.ControllingClient.FirstName + " " + presence.ControllingClient.LastName;
if (String.Compare(avatarName, name, true) == 0)
if (!presence.IsChildAgent)
{
avatar = presence;
return true;
string name = presence.ControllingClient.FirstName + " " + presence.ControllingClient.LastName;
if (String.Compare(avatarName, name, true) == 0)
{
avatar = presence;
return true;
}
}
}
}
@@ -1008,9 +1020,12 @@ namespace OpenSim.Region.Environment.Scenes
internal void ForEachClient(Action<IClientAPI> action)
{
foreach (ScenePresence presence in ScenePresences.Values)
lock (ScenePresences)
{
action(presence.ControllingClient);
foreach (ScenePresence presence in ScenePresences.Values)
{
action(presence.ControllingClient);
}
}
}