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

Remove parts locking from data classes since these are using a copy of the scene object

prebuild-update
Justin Clark-Casey (justincc) 2010-08-26 00:17:26 +01:00
parent 166ab59420
commit 692cf3c657
4 changed files with 160 additions and 173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs
View File

@ -89,7 +89,6 @@ namespace OpenSim.Data.MSSQL
Dictionary<UUID, SceneObjectGroup> objects = new Dictionary<UUID, SceneObjectGroup>(); Dictionary<UUID, SceneObjectGroup> objects = new Dictionary<UUID, SceneObjectGroup>();
SceneObjectGroup grp = null; SceneObjectGroup grp = null;
string sql = "SELECT *, " + string sql = "SELECT *, " +
"sort = CASE WHEN prims.UUID = prims.SceneGroupID THEN 0 ELSE 1 END " + "sort = CASE WHEN prims.UUID = prims.SceneGroupID THEN 0 ELSE 1 END " +
"FROM prims " + "FROM prims " +
@ -231,8 +230,6 @@ namespace OpenSim.Data.MSSQL
/// <param name="obj"></param> /// <param name="obj"></param>
/// <param name="regionUUID"></param> /// <param name="regionUUID"></param>
public void StoreObject(SceneObjectGroup obj, UUID regionUUID) public void StoreObject(SceneObjectGroup obj, UUID regionUUID)
{
lock (obj.Children)
{ {
_Log.DebugFormat("[MSSQL]: Adding/Changing SceneObjectGroup: {0} to region: {1}, object has {2} prims.", obj.UUID, regionUUID, obj.Children.Count); _Log.DebugFormat("[MSSQL]: Adding/Changing SceneObjectGroup: {0} to region: {1}, object has {2} prims.", obj.UUID, regionUUID, obj.Children.Count);
@ -294,7 +291,6 @@ namespace OpenSim.Data.MSSQL
} }
} }
} }
}
/// <summary> /// <summary>
/// Stores the prim of the sceneobjectpart. /// Stores the prim of the sceneobjectpart.

3
OpenSim/Data/MySQL/MySQLLegacyRegionData.cs
View File

@ -135,8 +135,6 @@ namespace OpenSim.Data.MySQL
dbcon.Open(); dbcon.Open();
MySqlCommand cmd = dbcon.CreateCommand(); MySqlCommand cmd = dbcon.CreateCommand();
lock (obj.Children)
{
foreach (SceneObjectPart prim in obj.Children.Values) foreach (SceneObjectPart prim in obj.Children.Values)
{ {
cmd.Parameters.Clear(); cmd.Parameters.Clear();
@ -246,7 +244,6 @@ namespace OpenSim.Data.MySQL
} }
} }
} }
}
public void RemoveObject(UUID obj, UUID regionUUID) public void RemoveObject(UUID obj, UUID regionUUID)
{ {

5
OpenSim/Data/SQLite/SQLiteRegionData.cs
View File

@ -359,16 +359,13 @@ namespace OpenSim.Data.SQLite
return; return;
lock (ds) lock (ds)
{
lock (obj.Children)
{ {
foreach (SceneObjectPart prim in obj.Children.Values) foreach (SceneObjectPart prim in obj.Children.Values)
{ {
// m_log.Info("[REGION DB]: Adding obj: " + obj.UUID + " to region: " + regionUUID); // m_log.Info("[REGION DB]: Adding obj: " + obj.UUID + " to region: " + regionUUID);
addPrim(prim, obj.UUID, regionUUID); addPrim(prim, obj.UUID, regionUUID);
} }
} }
}
Commit(); Commit();
// m_log.Info("[Dump of prims]: " + ds.GetXml()); // m_log.Info("[Dump of prims]: " + ds.GetXml());

5
OpenSim/Data/SQLiteLegacy/SQLiteRegionData.cs
View File

@ -326,16 +326,13 @@ namespace OpenSim.Data.SQLiteLegacy
return; return;
lock (ds) lock (ds)
{
lock (obj.Children)
{ {
foreach (SceneObjectPart prim in obj.Children.Values) foreach (SceneObjectPart prim in obj.Children.Values)
{ {
// m_log.Info("[REGION DB]: Adding obj: " + obj.UUID + " to region: " + regionUUID); // m_log.Info("[REGION DB]: Adding obj: " + obj.UUID + " to region: " + regionUUID);
addPrim(prim, obj.UUID, regionUUID); addPrim(prim, obj.UUID, regionUUID);
} }
} }
}
Commit(); Commit();
// m_log.Info("[Dump of prims]: " + ds.GetXml()); // m_log.Info("[Dump of prims]: " + ds.GetXml());