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

* Locking on local scope variable does not make sense - every thread will have its own 

* Locking on value, then changing it does not make sense - lock will happen on old reference
* Taking a local copy of the shared resource then locking on the copy does not make sense - lock will happen on copy
afrisby
lbsa71 2007-11-29 06:06:42 +00:00
parent b0c5693c02
commit d05b121dff
1 changed files with 21 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
View File

@ -35,8 +35,8 @@ namespace OpenSim.Region.Environment.Scenes
set set
{ {
_debugRegionName = value; _debugRegionName = value;
} }
} }
@ -177,10 +177,10 @@ namespace OpenSim.Region.Environment.Scenes
List<SimpleRegionInfo> neighbours = List<SimpleRegionInfo> neighbours =
m_commsProvider.GridService.RequestNeighbours(m_regionInfo.RegionLocX, m_regionInfo.RegionLocY); m_commsProvider.GridService.RequestNeighbours(m_regionInfo.RegionLocX, m_regionInfo.RegionLocY);
//IPEndPoint blah = new IPEndPoint(); //IPEndPoint blah = new IPEndPoint();
//blah.Address = region.RemotingAddress; //blah.Address = region.RemotingAddress;
//blah.Port = region.RemotingPort; //blah.Port = region.RemotingPort;
} }
@ -232,7 +232,7 @@ namespace OpenSim.Region.Environment.Scenes
} }
private void InformNeighboursThatRegionIsUpAsync(RegionInfo region, ulong regionhandle) private void InformNeighboursThatRegionIsUpAsync(RegionInfo region, ulong regionhandle)
{ {
MainLog.Instance.Notice("INTERGRID", "Starting to inform neighbors that I'm here"); MainLog.Instance.Notice("INTERGRID", "Starting to inform neighbors that I'm here");
bool regionAccepted = m_commsProvider.InterRegion.RegionUp((new SearializableRegionInfo(region)), regionhandle); bool regionAccepted = m_commsProvider.InterRegion.RegionUp((new SearializableRegionInfo(region)), regionhandle);
@ -250,29 +250,23 @@ namespace OpenSim.Region.Environment.Scenes
public void InformNeighborsThatRegionisUp(RegionInfo region) public void InformNeighborsThatRegionisUp(RegionInfo region)
{ {
//MainLog.Instance.Verbose("INTER", debugRegionName + ": SceneCommunicationService: Sending InterRegion Notification that region is up " + region.RegionName); //MainLog.Instance.Verbose("INTER", debugRegionName + ": SceneCommunicationService: Sending InterRegion Notification that region is up " + region.RegionName);
List<SimpleRegionInfo> neighbours = new List<SimpleRegionInfo>();
lock (neighbours)
{
neighbours = m_commsProvider.GridService.RequestNeighbours(m_regionInfo.RegionLocX, m_regionInfo.RegionLocY);
if (neighbours != null)
{
for (int i = 0; i < neighbours.Count; i++)
{
InformNeighbourThatRegionUpDelegate d = InformNeighboursThatRegionIsUpAsync; List<SimpleRegionInfo> neighbours = m_commsProvider.GridService.RequestNeighbours(m_regionInfo.RegionLocX, m_regionInfo.RegionLocY);
// race condition! Arg! I hate race conditions. if (neighbours != null)
lock (d) {
{ for (int i = 0; i < neighbours.Count; i++)
d.BeginInvoke(region, neighbours[i].RegionHandle, {
InformNeighborsThatRegionisUpCompleted,
d); InformNeighbourThatRegionUpDelegate d = InformNeighboursThatRegionIsUpAsync;
}
} d.BeginInvoke(region, neighbours[i].RegionHandle,
} InformNeighborsThatRegionisUpCompleted,
} d);
}
}
//bool val = m_commsProvider.InterRegion.RegionUp(new SearializableRegionInfo(region)); //bool val = m_commsProvider.InterRegion.RegionUp(new SearializableRegionInfo(region));
} }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
@ -294,7 +288,7 @@ namespace OpenSim.Region.Environment.Scenes
public virtual void RequestMapBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY) public virtual void RequestMapBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY)
{ {
List<MapBlockData> mapBlocks; List<MapBlockData> mapBlocks;
mapBlocks = m_commsProvider.GridService.RequestNeighbourMapBlocks(minX-4, minY-4, minX+4, minY+4); mapBlocks = m_commsProvider.GridService.RequestNeighbourMapBlocks(minX - 4, minY - 4, minX + 4, minY + 4);
remoteClient.SendMapBlock(mapBlocks); remoteClient.SendMapBlock(mapBlocks);
} }
@ -373,7 +367,7 @@ namespace OpenSim.Region.Environment.Scenes
{ {
foreach (ulong regionHandle in presence.KnownChildRegions) foreach (ulong regionHandle in presence.KnownChildRegions)
{ {
m_commsProvider.InterRegion.TellRegionToCloseChildConnection(regionHandle, presence.ControllingClient.AgentId); m_commsProvider.InterRegion.TellRegionToCloseChildConnection(regionHandle, presence.ControllingClient.AgentId);
presence.RemoveNeighbourRegion(regionHandle); presence.RemoveNeighbourRegion(regionHandle);
} }