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

Added locking in NullRegionData. 

This prevents errors when one thread iterates over the regions (e.g., from RegenerateMaptileAndReregister()) while another thread is adding a region.
0.7.4-extended
Oren Hurvitz 2012-12-14 16:17:07 +02:00 committed by Justin Clark-Casey (justincc)
parent 35a1949fb8
commit 86519bd407
1 changed files with 44 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
OpenSim/Data/Null/NullRegionData.cs
View File

@ -112,11 +112,14 @@ namespace OpenSim.Data.Null
// Find region data // Find region data
List<RegionData> ret = new List<RegionData>(); List<RegionData> ret = new List<RegionData>();
foreach (RegionData r in m_regionData.Values) lock (m_regionData)
{ {
// m_log.DebugFormat("[NULL REGION DATA]: comparing {0} to {1}", cleanName, r.RegionName.ToLower()); foreach (RegionData r in m_regionData.Values)
{
// m_log.DebugFormat("[NULL REGION DATA]: comparing {0} to {1}", cleanName, r.RegionName.ToLower());
if (queryMatch(r.RegionName.ToLower())) if (queryMatch(r.RegionName.ToLower()))
ret.Add(r); ret.Add(r);
}
} }
if (ret.Count > 0) if (ret.Count > 0)
@ -132,10 +135,13 @@ namespace OpenSim.Data.Null
List<RegionData> ret = new List<RegionData>(); List<RegionData> ret = new List<RegionData>();
foreach (RegionData r in m_regionData.Values) lock (m_regionData)
{ {
if (r.posX == posX && r.posY == posY) foreach (RegionData r in m_regionData.Values)
ret.Add(r); {
if (r.posX == posX && r.posY == posY)
ret.Add(r);
}
} }
if (ret.Count > 0) if (ret.Count > 0)
@ -149,8 +155,11 @@ namespace OpenSim.Data.Null
if (m_useStaticInstance && Instance != this) if (m_useStaticInstance && Instance != this)
return Instance.Get(regionID, scopeID); return Instance.Get(regionID, scopeID);
if (m_regionData.ContainsKey(regionID)) lock (m_regionData)
return m_regionData[regionID]; {
if (m_regionData.ContainsKey(regionID))
return m_regionData[regionID];
}
return null; return null;
} }
@ -162,10 +171,13 @@ namespace OpenSim.Data.Null
List<RegionData> ret = new List<RegionData>(); List<RegionData> ret = new List<RegionData>();
foreach (RegionData r in m_regionData.Values) lock (m_regionData)
{ {
if (r.posX >= startX && r.posX <= endX && r.posY >= startY && r.posY <= endY) foreach (RegionData r in m_regionData.Values)
ret.Add(r); {
if (r.posX >= startX && r.posX <= endX && r.posY >= startY && r.posY <= endY)
ret.Add(r);
}
} }
return ret; return ret;
@ -179,7 +191,10 @@ namespace OpenSim.Data.Null
// m_log.DebugFormat( // m_log.DebugFormat(
// "[NULL REGION DATA]: Storing region {0} {1}, scope {2}", data.RegionName, data.RegionID, data.ScopeID); // "[NULL REGION DATA]: Storing region {0} {1}, scope {2}", data.RegionName, data.RegionID, data.ScopeID);
m_regionData[data.RegionID] = data; lock (m_regionData)
{
m_regionData[data.RegionID] = data;
}
return true; return true;
} }
@ -189,10 +204,13 @@ namespace OpenSim.Data.Null
if (m_useStaticInstance && Instance != this) if (m_useStaticInstance && Instance != this)
return Instance.SetDataItem(regionID, item, value); return Instance.SetDataItem(regionID, item, value);
if (!m_regionData.ContainsKey(regionID)) lock (m_regionData)
return false; {
if (!m_regionData.ContainsKey(regionID))
return false;
m_regionData[regionID].Data[item] = value; m_regionData[regionID].Data[item] = value;
}
return true; return true;
} }
@ -204,10 +222,13 @@ namespace OpenSim.Data.Null
// m_log.DebugFormat("[NULL REGION DATA]: Deleting region {0}", regionID); // m_log.DebugFormat("[NULL REGION DATA]: Deleting region {0}", regionID);
if (!m_regionData.ContainsKey(regionID)) lock (m_regionData)
return false; {
if (!m_regionData.ContainsKey(regionID))
return false;
m_regionData.Remove(regionID); m_regionData.Remove(regionID);
}
return true; return true;
} }
@ -237,10 +258,13 @@ namespace OpenSim.Data.Null
List<RegionData> ret = new List<RegionData>(); List<RegionData> ret = new List<RegionData>();
foreach (RegionData r in m_regionData.Values) lock (m_regionData)
{ {
if ((Convert.ToInt32(r.Data["flags"]) & regionFlags) != 0) foreach (RegionData r in m_regionData.Values)
ret.Add(r); {
if ((Convert.ToInt32(r.Data["flags"]) & regionFlags) != 0)
ret.Add(r);
}
} }
return ret; return ret;