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

Lock m_landlist whilst loading parcels from storage to prevent a race against any parcel auto-creation in GetLandObject()

0.8.0.3
Justin Clark-Casey (justincc) 2014-03-07 01:36:06 +00:00
parent 6b7625a56b
commit 3c05d67094
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
View File

@ -915,10 +915,16 @@ namespace OpenSim.Region.CoreModules.World.Land
landID = m_lastLandLocalID; landID = m_lastLandLocalID;
} }
else
{
// XXX: We're not currently doing anything if there are no parcels, as this might indicate a race
// condition where this method is being called before land data is loaded. May need to address
// this in another way.
// XXX: We're not currently doing anything if there are no parcels, as this might indicate a race m_log.WarnFormat(
// condition where this method is being called before land data is loaded. May need to address "[{0}]: Ignoring request to auto-create parcel in {1} as there are no other parcels present",
// this in another way. LogHeader, m_scene.Name);
}
} }
ret = m_landList[landID]; ret = m_landList[landID];
@ -1545,16 +1551,21 @@ namespace OpenSim.Region.CoreModules.World.Land
#region Land Object From Storage Functions #region Land Object From Storage Functions
public void EventManagerOnIncomingLandDataFromStorage(List<LandData> data) private void EventManagerOnIncomingLandDataFromStorage(List<LandData> data)
{ {
// m_log.DebugFormat( // m_log.DebugFormat(
// "[LAND MANAGMENT MODULE]: Processing {0} incoming parcels on {1}", data.Count, m_scene.Name); // "[LAND MANAGMENT MODULE]: Processing {0} incoming parcels on {1}", data.Count, m_scene.Name);
for (int i = 0; i < data.Count; i++) // Prevent race conditions from any auto-creation of new parcels for varregions whilst we are still loading
IncomingLandObjectFromStorage(data[i]); // the existing parcels.
lock (m_landList)
{
for (int i = 0; i < data.Count; i++)
IncomingLandObjectFromStorage(data[i]);
}
} }
public void IncomingLandObjectFromStorage(LandData data) private void IncomingLandObjectFromStorage(LandData data)
{ {
ILandObject new_land = new LandObject(data.OwnerID, data.IsGroupOwned, m_scene); ILandObject new_land = new LandObject(data.OwnerID, data.IsGroupOwned, m_scene);
new_land.LandData = data.Copy(); new_land.LandData = data.Copy();