ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-01 06:06:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Implement non-wait co-operative termination of scripts for XEngine in addition to termination on wait.

Browse Source 
This involves inserting opensim_reserved_CheckForCoopTermination() calls in lsl -> c# translation at any place where the script could be in a loop with no wait calls.
These places are for, while, do-while, label, user function call and manual event function call.
Call goes through to an XEngineScriptBase which extends ScriptBase.
IEngine is extended to supply necessary engine-specific parent class references and constructor parameters to Compiler.
Unfortunately, since XEngineScriptBase has to be passed WaitHandle in its constructor, older compiled scripts will fail to load with an error on the OpenSim console.
Such scripts will need to be recompiled, either by removing all *.dll files from the bin/ScriptEngines/<region-id> or by setting DeleteScriptsOnStartup = true in [XEngine] for one run.
Automatic recompilation may be implemented in a later commit.
This feature should not yet be used, default remains termination with Thread.Abort() which will work as normal once scripts are recompiled.
This commit is contained in:
Justin Clark-Casey (justincc)
2013-01-17 23:39:09 +00:00
parent 9c99ed26eb
commit c8afc8523b
8 changed files with 307 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
View File

@@ -267,13 +267,27 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
try
{
if (dom != System.AppDomain.CurrentDomain)
m_Script = (IScript)dom.CreateInstanceAndUnwrap(
m_Script
= (IScript)dom.CreateInstanceAndUnwrap(
Path.GetFileNameWithoutExtension(assembly),
"SecondLife.Script");
"SecondLife.Script",
false,
BindingFlags.Default,
null,
new object[] { m_coopSleepHandle },
null,
null,
null);
else
m_Script = (IScript)Assembly.Load(
Path.GetFileNameWithoutExtension(assembly)).CreateInstance(
"SecondLife.Script");
m_Script
= (IScript)Assembly.Load(Path.GetFileNameWithoutExtension(assembly)).CreateInstance(
"SecondLife.Script",
false,
BindingFlags.Default,
null,
new object[] { m_coopSleepHandle },
null,
null);
//ILease lease = (ILease)RemotingServices.GetLifetimeService(m_Script as ScriptBaseClass);
//RemotingServices.GetLifetimeService(m_Script as ScriptBaseClass);