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

Queue all events for a script that is waiting to compile 

This fixes CHANGED_OWNER the right way. It also vastly improves link
message handling during object rez, which was iffy before. Now no
messages are lost anymore.
melanie
Melanie Thielker 2017-01-07 00:25:59 +00:00
parent fa5c47b916
commit d9dba51223
1 changed files with 56 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
View File

@ -182,7 +182,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
private ScriptCompileQueue m_CompileQueue = new ScriptCompileQueue(); private ScriptCompileQueue m_CompileQueue = new ScriptCompileQueue();
IWorkItemResult m_CurrentCompile = null; IWorkItemResult m_CurrentCompile = null;
private Dictionary<UUID, int> m_CompileDict = new Dictionary<UUID, int>(); private Dictionary<UUID, ScriptCompileInfo> m_CompileDict = new Dictionary<UUID, ScriptCompileInfo>();
private ScriptEngineConsoleCommands m_consoleCommands; private ScriptEngineConsoleCommands m_consoleCommands;
@ -236,6 +236,11 @@ namespace OpenSim.Region.ScriptEngine.XEngine
get { return m_ConfigSource; } get { return m_ConfigSource; }
} }
private class ScriptCompileInfo
{
public List<EventParams> eventList = new List<EventParams>();
}
/// <summary> /// <summary>
/// Event fired after the script engine has finished removing a script. /// Event fired after the script engine has finished removing a script.
/// </summary> /// </summary>
@ -1005,18 +1010,12 @@ namespace OpenSim.Region.ScriptEngine.XEngine
Object[] parms = new Object[]{localID, itemID, script, startParam, postOnRez, (StateSource)stateSource}; Object[] parms = new Object[]{localID, itemID, script, startParam, postOnRez, (StateSource)stateSource};
// There IS such a thing as too much optimization!! if (stateSource == (int)StateSource.ScriptedRez)
// DON'T try to defer and queue the below states!
// Doing so may make rezzing snappier in world, but prevents
// vital events like attach, changed owner, etc, from firing.
// This just MUST be synchronous. Believe me, I'm The Author!
if (stateSource == (int)StateSource.ScriptedRez ||
stateSource == (int)StateSource.NewRez ||
stateSource == (int)StateSource.AttachedRez)
{ {
lock (m_CompileDict) lock (m_CompileDict)
{ {
m_CompileDict[itemID] = 0; m_log.DebugFormat("[XENGINE]: Set compile dict for {0}", itemID);
m_CompileDict[itemID] = new ScriptCompileInfo();
} }
DoOnRezScript(parms); DoOnRezScript(parms);
@ -1024,7 +1023,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine
else else
{ {
lock (m_CompileDict) lock (m_CompileDict)
m_CompileDict[itemID] = 0; m_CompileDict[itemID] = new ScriptCompileInfo();
m_log.DebugFormat("[XENGINE]: Set compile dict for {0} delayed", itemID);
// This must occur after the m_CompileDict so that an existing compile thread cannot hit the check // This must occur after the m_CompileDict so that an existing compile thread cannot hit the check
// in DoOnRezScript() before m_CompileDict has been updated. // in DoOnRezScript() before m_CompileDict has been updated.
@ -1142,7 +1142,6 @@ namespace OpenSim.Region.ScriptEngine.XEngine
{ {
if (!m_CompileDict.ContainsKey(itemID)) if (!m_CompileDict.ContainsKey(itemID))
return false; return false;
m_CompileDict.Remove(itemID);
} }
// Get the asset ID of the script, so we can check if we // Get the asset ID of the script, so we can check if we
@ -1157,6 +1156,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine
m_log.ErrorFormat("[Script]: SceneObjectPart with localID {0} unavailable. Script NOT started.", localID); m_log.ErrorFormat("[Script]: SceneObjectPart with localID {0} unavailable. Script NOT started.", localID);
m_ScriptErrorMessage += "SceneObjectPart unavailable. Script NOT started.\n"; m_ScriptErrorMessage += "SceneObjectPart unavailable. Script NOT started.\n";
m_ScriptFailCount++; m_ScriptFailCount++;
lock (m_CompileDict)
m_CompileDict.Remove(itemID);
return false; return false;
} }
@ -1165,6 +1166,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine
{ {
m_ScriptErrorMessage += "Can't find script inventory item.\n"; m_ScriptErrorMessage += "Can't find script inventory item.\n";
m_ScriptFailCount++; m_ScriptFailCount++;
lock (m_CompileDict)
m_CompileDict.Remove(itemID);
return false; return false;
} }
@ -1282,6 +1285,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine
// e.Message.ToString()); // e.Message.ToString());
// } // }
lock (m_CompileDict)
m_CompileDict.Remove(itemID);
return false; return false;
} }
} }
@ -1352,6 +1357,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine
{ {
m_AddingAssemblies[assemblyPath]--; m_AddingAssemblies[assemblyPath]--;
} }
lock (m_CompileDict)
m_CompileDict.Remove(itemID);
return false; return false;
} }
} }
@ -1409,6 +1416,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine
assemblyName.FullName, World.Name), assemblyName.FullName, World.Name),
e2); e2);
lock (m_CompileDict)
m_CompileDict.Remove(itemID);
return false; return false;
} }
@ -1458,6 +1467,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine
assemblyName.FullName, World.Name), assemblyName.FullName, World.Name),
e2); e2);
lock (m_CompileDict)
m_CompileDict.Remove(itemID);
return false; return false;
} }
@ -1485,7 +1496,11 @@ namespace OpenSim.Region.ScriptEngine.XEngine
if(!instance.Load(scriptObj, coopSleepHandle, assemblyPath, if(!instance.Load(scriptObj, coopSleepHandle, assemblyPath,
Path.Combine(ScriptEnginePath, World.RegionInfo.RegionID.ToString()), stateSource, coopTerminationForThisScript)) Path.Combine(ScriptEnginePath, World.RegionInfo.RegionID.ToString()), stateSource, coopTerminationForThisScript))
{
lock (m_CompileDict)
m_CompileDict.Remove(itemID);
return false; return false;
}
// if (DebugLevel >= 1) // if (DebugLevel >= 1)
// m_log.DebugFormat( // m_log.DebugFormat(
@ -1525,7 +1540,16 @@ namespace OpenSim.Region.ScriptEngine.XEngine
} }
if (instance != null) if (instance != null)
{
instance.Init(); instance.Init();
lock (m_CompileDict)
{
foreach (EventParams pp in m_CompileDict[itemID].eventList)
instance.PostEvent(pp);
}
}
lock (m_CompileDict)
m_CompileDict.Remove(itemID);
bool runIt; bool runIt;
if (m_runFlags.TryGetValue(itemID, out runIt)) if (m_runFlags.TryGetValue(itemID, out runIt))
@ -1749,6 +1773,17 @@ namespace OpenSim.Region.ScriptEngine.XEngine
instance.PostEvent(p); instance.PostEvent(p);
result = true; result = true;
} }
else
{
lock (m_CompileDict)
{
if (m_CompileDict.ContainsKey(itemID))
{
m_CompileDict[itemID].eventList.Add(p);
result = true;
}
}
}
} }
} }
@ -1770,6 +1805,14 @@ namespace OpenSim.Region.ScriptEngine.XEngine
instance.PostEvent(p); instance.PostEvent(p);
return true; return true;
} }
lock (m_CompileDict)
{
if (m_CompileDict.ContainsKey(itemID))
{
m_CompileDict[itemID].eventList.Add(p);
return true;
}
}
return false; return false;
} }