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

Relaxed the ultra-conservative lock on m_items. Needs testing under linux and stress.

prebuild-update
Diva Canto 2010-07-20 05:59:18 -07:00
parent b7f1288361
commit 7c124a5543
1 changed files with 190 additions and 221 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

173
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
View File

@ -118,20 +118,20 @@ namespace OpenSim.Region.Framework.Scenes
/// <param name="linkNum">Link number for the part</param> /// <param name="linkNum">Link number for the part</param>
public void ResetInventoryIDs() public void ResetInventoryIDs()
{ {
lock (Items) lock (m_items)
{ {
if (0 == Items.Count) if (0 == m_items.Count)
return; return;
HasInventoryChanged = true; HasInventoryChanged = true;
m_part.ParentGroup.HasGroupChanged = true; m_part.ParentGroup.HasGroupChanged = true;
IList<TaskInventoryItem> items = new List<TaskInventoryItem>(Items.Values); IList<TaskInventoryItem> items = GetInventoryItems();
Items.Clear(); m_items.Clear();
foreach (TaskInventoryItem item in items) foreach (TaskInventoryItem item in items)
{ {
item.ResetIDs(m_part.UUID); item.ResetIDs(m_part.UUID);
Items.Add(item.ItemID, item); m_items.Add(item.ItemID, item);
} }
} }
} }
@ -148,10 +148,11 @@ namespace OpenSim.Region.Framework.Scenes
{ {
return; return;
} }
}
HasInventoryChanged = true; HasInventoryChanged = true;
m_part.ParentGroup.HasGroupChanged = true; m_part.ParentGroup.HasGroupChanged = true;
IList<TaskInventoryItem> items = new List<TaskInventoryItem>(Items.Values); List<TaskInventoryItem> items = GetInventoryItems();
foreach (TaskInventoryItem item in items) foreach (TaskInventoryItem item in items)
{ {
if (ownerId != item.OwnerID) if (ownerId != item.OwnerID)
@ -161,7 +162,6 @@ namespace OpenSim.Region.Framework.Scenes
} }
} }
} }
}
/// <summary> /// <summary>
/// Change every item in this inventory to a new group. /// Change every item in this inventory to a new group.
@ -175,36 +175,27 @@ namespace OpenSim.Region.Framework.Scenes
{ {
return; return;
} }
}
HasInventoryChanged = true; HasInventoryChanged = true;
m_part.ParentGroup.HasGroupChanged = true; m_part.ParentGroup.HasGroupChanged = true;
IList<TaskInventoryItem> items = new List<TaskInventoryItem>(Items.Values); List<TaskInventoryItem> items = GetInventoryItems();
foreach (TaskInventoryItem item in items) foreach (TaskInventoryItem item in items)
{ {
if (groupID != item.GroupID) if (groupID != item.GroupID)
{
item.GroupID = groupID; item.GroupID = groupID;
} }
} }
}
}
/// <summary> /// <summary>
/// Start all the scripts contained in this prim's inventory /// Start all the scripts contained in this prim's inventory
/// </summary> /// </summary>
public void CreateScriptInstances(int startParam, bool postOnRez, string engine, int stateSource) public void CreateScriptInstances(int startParam, bool postOnRez, string engine, int stateSource)
{ {
lock (m_items) List<TaskInventoryItem> scripts = GetInventoryScripts();
{ foreach (TaskInventoryItem item in scripts)
foreach (TaskInventoryItem item in Items.Values)
{
if ((int)InventoryType.LSL == item.InvType)
{
CreateScriptInstance(item, startParam, postOnRez, engine, stateSource); CreateScriptInstance(item, startParam, postOnRez, engine, stateSource);
} }
}
}
}
public ArrayList GetScriptErrors(UUID itemID) public ArrayList GetScriptErrors(UUID itemID)
{ {
@ -236,17 +227,10 @@ namespace OpenSim.Region.Framework.Scenes
/// </param> /// </param>
public void RemoveScriptInstances(bool sceneObjectBeingDeleted) public void RemoveScriptInstances(bool sceneObjectBeingDeleted)
{ {
lock (Items) List<TaskInventoryItem> scripts = GetInventoryScripts();
{ foreach (TaskInventoryItem item in scripts)
foreach (TaskInventoryItem item in Items.Values)
{
if ((int)InventoryType.LSL == item.InvType)
{
RemoveScriptInstance(item.ItemID, sceneObjectBeingDeleted); RemoveScriptInstance(item.ItemID, sceneObjectBeingDeleted);
} }
}
}
}
/// <summary> /// <summary>
/// Start a script which is in this prim's inventory. /// Start a script which is in this prim's inventory.
@ -375,22 +359,16 @@ namespace OpenSim.Region.Framework.Scenes
/// </param> /// </param>
public void CreateScriptInstance(UUID itemId, int startParam, bool postOnRez, string engine, int stateSource) public void CreateScriptInstance(UUID itemId, int startParam, bool postOnRez, string engine, int stateSource)
{ {
lock (m_items) TaskInventoryItem item = GetInventoryItem(itemId);
{ if (item != null)
if (m_items.ContainsKey(itemId)) CreateScriptInstance(item, startParam, postOnRez, engine, stateSource);
{
CreateScriptInstance(m_items[itemId], startParam, postOnRez, engine, stateSource);
}
else else
{
m_log.ErrorFormat( m_log.ErrorFormat(
"[PRIM INVENTORY]: " + "[PRIM INVENTORY]: " +
"Couldn't start script with ID {0} since it couldn't be found for prim {1}, {2} at {3} in {4}", "Couldn't start script with ID {0} since it couldn't be found for prim {1}, {2} at {3} in {4}",
itemId, m_part.Name, m_part.UUID, itemId, m_part.Name, m_part.UUID,
m_part.AbsolutePosition, m_part.ParentGroup.Scene.RegionInfo.RegionName); m_part.AbsolutePosition, m_part.ParentGroup.Scene.RegionInfo.RegionName);
} }
}
}
/// <summary> /// <summary>
/// Stop a script which is in this prim's inventory. /// Stop a script which is in this prim's inventory.
@ -430,17 +408,19 @@ namespace OpenSim.Region.Framework.Scenes
/// <summary> /// <summary>
/// Check if the inventory holds an item with a given name. /// Check if the inventory holds an item with a given name.
/// This method assumes that the task inventory is already locked.
/// </summary> /// </summary>
/// <param name="name"></param> /// <param name="name"></param>
/// <returns></returns> /// <returns></returns>
private bool InventoryContainsName(string name) private bool InventoryContainsName(string name)
{ {
foreach (TaskInventoryItem item in Items.Values) lock (m_items)
{
foreach (TaskInventoryItem item in m_items.Values)
{ {
if (item.Name == name) if (item.Name == name)
return true; return true;
} }
}
return false; return false;
} }
@ -482,12 +462,7 @@ namespace OpenSim.Region.Framework.Scenes
/// <param name="item"></param> /// <param name="item"></param>
public void AddInventoryItemExclusive(TaskInventoryItem item, bool allowedDrop) public void AddInventoryItemExclusive(TaskInventoryItem item, bool allowedDrop)
{ {
List<TaskInventoryItem> il; List<TaskInventoryItem> il = GetInventoryItems();
lock (m_items)
{
il = new List<TaskInventoryItem>(m_items.Values);
}
foreach (TaskInventoryItem i in il) foreach (TaskInventoryItem i in il)
{ {
@ -527,14 +502,12 @@ namespace OpenSim.Region.Framework.Scenes
item.GroupID = m_part.GroupID; item.GroupID = m_part.GroupID;
lock (m_items) lock (m_items)
{
m_items.Add(item.ItemID, item); m_items.Add(item.ItemID, item);
if (allowedDrop) if (allowedDrop)
m_part.TriggerScriptChangedEvent(Changed.ALLOWED_DROP); m_part.TriggerScriptChangedEvent(Changed.ALLOWED_DROP);
else else
m_part.TriggerScriptChangedEvent(Changed.INVENTORY); m_part.TriggerScriptChangedEvent(Changed.INVENTORY);
}
m_inventorySerial++; m_inventorySerial++;
//m_inventorySerial += 2; //m_inventorySerial += 2;
@ -558,10 +531,9 @@ namespace OpenSim.Region.Framework.Scenes
m_items.Add(item.ItemID, item); m_items.Add(item.ItemID, item);
// m_part.TriggerScriptChangedEvent(Changed.INVENTORY); // m_part.TriggerScriptChangedEvent(Changed.INVENTORY);
} }
}
m_inventorySerial++; m_inventorySerial++;
} }
}
/// <summary> /// <summary>
/// Returns an existing inventory item. Returns the original, so any changes will be live. /// Returns an existing inventory item. Returns the original, so any changes will be live.
@ -615,11 +587,8 @@ namespace OpenSim.Region.Framework.Scenes
public bool UpdateInventoryItem(TaskInventoryItem item, bool fireScriptEvents) public bool UpdateInventoryItem(TaskInventoryItem item, bool fireScriptEvents)
{ {
lock(m_items) TaskInventoryItem it = GetInventoryItem(item.ItemID);
{ if (it != null)
if (m_items.ContainsKey(item.ItemID))
{
if (m_items.ContainsKey(item.ItemID))
{ {
item.ParentID = m_part.UUID; item.ParentID = m_part.UUID;
item.ParentPartID = m_part.UUID; item.ParentPartID = m_part.UUID;
@ -631,13 +600,17 @@ namespace OpenSim.Region.Framework.Scenes
item.GroupID = m_part.GroupID; item.GroupID = m_part.GroupID;
if (item.AssetID == UUID.Zero) if (item.AssetID == UUID.Zero)
item.AssetID = it.AssetID;
lock (m_items)
{ {
item.AssetID = m_items[item.ItemID].AssetID;
}
m_items[item.ItemID] = item; m_items[item.ItemID] = item;
m_inventorySerial++; m_inventorySerial++;
}
if (fireScriptEvents) if (fireScriptEvents)
m_part.TriggerScriptChangedEvent(Changed.INVENTORY); m_part.TriggerScriptChangedEvent(Changed.INVENTORY);
HasInventoryChanged = true; HasInventoryChanged = true;
m_part.ParentGroup.HasGroupChanged = true; m_part.ParentGroup.HasGroupChanged = true;
return true; return true;
@ -650,10 +623,8 @@ namespace OpenSim.Region.Framework.Scenes
item.ItemID, m_part.Name, m_part.UUID, item.ItemID, m_part.Name, m_part.UUID,
m_part.AbsolutePosition, m_part.ParentGroup.Scene.RegionInfo.RegionName); m_part.AbsolutePosition, m_part.ParentGroup.Scene.RegionInfo.RegionName);
} }
}
return false; return false;
}
} }
/// <summary> /// <summary>
@ -664,9 +635,8 @@ namespace OpenSim.Region.Framework.Scenes
/// in this prim's inventory.</returns> /// in this prim's inventory.</returns>
public int RemoveInventoryItem(UUID itemID) public int RemoveInventoryItem(UUID itemID)
{ {
lock (m_items) TaskInventoryItem item = GetInventoryItem(itemID);
{ if (item != null)
if (m_items.ContainsKey(itemID))
{ {
int type = m_items[itemID].InvType; int type = m_items[itemID].InvType;
if (type == 10) // Script if (type == 10) // Script
@ -681,26 +651,13 @@ namespace OpenSim.Region.Framework.Scenes
HasInventoryChanged = true; HasInventoryChanged = true;
m_part.ParentGroup.HasGroupChanged = true; m_part.ParentGroup.HasGroupChanged = true;
int scriptcount = 0; if (!ContainsScripts())
lock (m_items)
{
foreach (TaskInventoryItem item in m_items.Values)
{
if (item.Type == 10)
{
scriptcount++;
}
}
}
if (scriptcount <= 0)
{
m_part.RemFlag(PrimFlags.Scripted); m_part.RemFlag(PrimFlags.Scripted);
}
m_part.ScheduleFullUpdate(); m_part.ScheduleFullUpdate();
return type; return type;
} }
else else
{ {
@ -710,7 +667,6 @@ namespace OpenSim.Region.Framework.Scenes
itemID, m_part.Name, m_part.UUID, itemID, m_part.Name, m_part.UUID,
m_part.AbsolutePosition, m_part.ParentGroup.Scene.RegionInfo.RegionName); m_part.AbsolutePosition, m_part.ParentGroup.Scene.RegionInfo.RegionName);
} }
}
return -1; return -1;
} }
@ -763,9 +719,8 @@ namespace OpenSim.Region.Framework.Scenes
// isn't available (such as drag from prim inventory to agent inventory) // isn't available (such as drag from prim inventory to agent inventory)
InventoryStringBuilder invString = new InventoryStringBuilder(m_part.UUID, UUID.Zero); InventoryStringBuilder invString = new InventoryStringBuilder(m_part.UUID, UUID.Zero);
lock (m_items) List<TaskInventoryItem> items = GetInventoryItems();
{ foreach (TaskInventoryItem item in items)
foreach (TaskInventoryItem item in m_items.Values)
{ {
UUID ownerID = item.OwnerID; UUID ownerID = item.OwnerID;
uint everyoneMask = 0; uint everyoneMask = 0;
@ -809,7 +764,6 @@ namespace OpenSim.Region.Framework.Scenes
invString.AddNameValueLine("creation_date", item.CreationDate.ToString()); invString.AddNameValueLine("creation_date", item.CreationDate.ToString());
invString.AddSectionEnd(); invString.AddSectionEnd();
} }
}
fileData = Utils.StringToBytes(invString.BuildString); fileData = Utils.StringToBytes(invString.BuildString);
@ -830,12 +784,10 @@ namespace OpenSim.Region.Framework.Scenes
{ {
if (HasInventoryChanged) if (HasInventoryChanged)
{ {
lock (Items)
{
datastore.StorePrimInventory(m_part.UUID, Items.Values);
}
HasInventoryChanged = false; HasInventoryChanged = false;
List<TaskInventoryItem> items = GetInventoryItems();
datastore.StorePrimInventory(m_part.UUID, items);
} }
} }
@ -1001,6 +953,30 @@ namespace OpenSim.Region.Framework.Scenes
return ret; return ret;
} }
public List<TaskInventoryItem> GetInventoryItems()
{
List<TaskInventoryItem> ret = new List<TaskInventoryItem>();
lock (m_items)
ret = new List<TaskInventoryItem>(m_items.Values);
return ret;
}
public List<TaskInventoryItem> GetInventoryScripts()
{
List<TaskInventoryItem> ret = new List<TaskInventoryItem>();
lock (m_items)
{
foreach (TaskInventoryItem item in m_items.Values)
if (item.InvType == (int)InventoryType.LSL)
ret.Add(item);
}
return ret;
}
public Dictionary<UUID, string> GetScriptStates() public Dictionary<UUID, string> GetScriptStates()
{ {
IScriptModule[] engines = m_part.ParentGroup.Scene.RequestModuleInterfaces<IScriptModule>(); IScriptModule[] engines = m_part.ParentGroup.Scene.RequestModuleInterfaces<IScriptModule>();
@ -1009,11 +985,9 @@ namespace OpenSim.Region.Framework.Scenes
if (engines == null) // No engine at all if (engines == null) // No engine at all
return ret; return ret;
lock (m_items) List<TaskInventoryItem> scripts = GetInventoryScripts();
{
foreach (TaskInventoryItem item in m_items.Values) foreach (TaskInventoryItem item in scripts)
{
if (item.InvType == (int)InventoryType.LSL)
{ {
foreach (IScriptModule e in engines) foreach (IScriptModule e in engines)
{ {
@ -1029,8 +1003,6 @@ namespace OpenSim.Region.Framework.Scenes
} }
} }
} }
}
}
return ret; return ret;
} }
@ -1041,11 +1013,9 @@ namespace OpenSim.Region.Framework.Scenes
if (engines == null) if (engines == null)
return; return;
lock (m_items) List<TaskInventoryItem> scripts = GetInventoryScripts();
{
foreach (TaskInventoryItem item in m_items.Values) foreach (TaskInventoryItem item in scripts)
{
if (item.InvType == (int)InventoryType.LSL)
{ {
foreach (IScriptModule engine in engines) foreach (IScriptModule engine in engines)
{ {
@ -1059,7 +1029,6 @@ namespace OpenSim.Region.Framework.Scenes
} }
} }
} }
}
}
} }
} }