aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/prebuild.xml
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-01-17 23:39:09 +0000
committerJustin Clark-Casey (justincc)2013-01-17 23:39:09 +0000
commitc8afc8523b9caf931afb3d5b3f9874b26b866a77 (patch)
treeb1a84d82591f462ae61b3aeed4f4b6dd3c5c06e8 /prebuild.xml
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC_OLD-c8afc8523b9caf931afb3d5b3f9874b26b866a77.zip
opensim-SC_OLD-c8afc8523b9caf931afb3d5b3f9874b26b866a77.tar.gz
opensim-SC_OLD-c8afc8523b9caf931afb3d5b3f9874b26b866a77.tar.bz2
opensim-SC_OLD-c8afc8523b9caf931afb3d5b3f9874b26b866a77.tar.xz
Implement non-wait co-operative termination of scripts for XEngine in addition to termination on wait.
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.
Diffstat (limited to '')
-rw-r--r--prebuild.xml36
1 files changed, 36 insertions, 0 deletions
diff --git a/prebuild.xml b/prebuild.xml
index abf8f36..4019e0b 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -2423,6 +2423,40 @@
2423 </Files> 2423 </Files>
2424 </Project> 2424 </Project>
2425 2425
2426 <Project frameworkVersion="v3_5" name="OpenSim.Region.ScriptEngine.XEngine.Api.Runtime" path="OpenSim/Region/ScriptEngine/XEngine/Api/Runtime" type="Library">
2427 <Configuration name="Debug">
2428 <Options>
2429 <OutputPath>../../../../../../bin/</OutputPath>
2430 </Options>
2431 </Configuration>
2432 <Configuration name="Release">
2433 <Options>
2434 <OutputPath>../../../../../../bin/</OutputPath>
2435 </Options>
2436 </Configuration>
2437
2438 <ReferencePath>../../../../../../bin/</ReferencePath>
2439 <Reference name="System"/>
2440 <Reference name="System.Data"/>
2441 <Reference name="System.Web"/>
2442 <Reference name="System.Xml"/>
2443 <Reference name="OpenMetaverseTypes" path="../../../../../../bin/"/>
2444 <Reference name="OpenSim"/>
2445 <Reference name="OpenSim.Framework"/>
2446 <Reference name="OpenSim.Framework.Communications"/>
2447 <Reference name="OpenSim.Region.Framework"/>
2448 <Reference name="OpenSim.Region.CoreModules"/>
2449 <Reference name="OpenSim.Framework.Console"/>
2450 <Reference name="OpenSim.Region.ScriptEngine.Shared"/>
2451 <Reference name="OpenSim.Region.ScriptEngine.Shared.Api.Runtime"/>
2452 <Reference name="Nini" path="../../../../../../bin/"/>
2453 <Reference name="log4net" path="../../../../../../bin/"/>
2454
2455 <Files>
2456 <Match pattern="*.cs" recurse="true"/>
2457 </Files>
2458 </Project>
2459
2426 <Project frameworkVersion="v3_5" name="OpenSim.Region.ScriptEngine.XEngine" path="OpenSim/Region/ScriptEngine/XEngine" type="Library"> 2460 <Project frameworkVersion="v3_5" name="OpenSim.Region.ScriptEngine.XEngine" path="OpenSim/Region/ScriptEngine/XEngine" type="Library">
2427 <Configuration name="Debug"> 2461 <Configuration name="Debug">
2428 <Options> 2462 <Options>
@@ -2453,6 +2487,7 @@
2453 <Reference name="OpenSim.Region.ScriptEngine.Shared.CodeTools"/> 2487 <Reference name="OpenSim.Region.ScriptEngine.Shared.CodeTools"/>
2454 <Reference name="OpenSim.Region.ScriptEngine.Shared.Instance"/> 2488 <Reference name="OpenSim.Region.ScriptEngine.Shared.Instance"/>
2455 <Reference name="OpenSim.Region.ScriptEngine.Shared.Api"/> 2489 <Reference name="OpenSim.Region.ScriptEngine.Shared.Api"/>
2490 <Reference name="OpenSim.Region.ScriptEngine.XEngine.Api.Runtime"/>
2456 <Reference name="SmartThreadPool"/> 2491 <Reference name="SmartThreadPool"/>
2457 <Reference name="Nini" path="../../../../bin/"/> 2492 <Reference name="Nini" path="../../../../bin/"/>
2458 <Reference name="log4net" path="../../../../bin/"/> 2493 <Reference name="log4net" path="../../../../bin/"/>
@@ -2460,6 +2495,7 @@
2460 <Files> 2495 <Files>
2461 <Match buildAction="EmbeddedResource" path="Resources" pattern="*.addin.xml" recurse="true"/> 2496 <Match buildAction="EmbeddedResource" path="Resources" pattern="*.addin.xml" recurse="true"/>
2462 <Match pattern="*.cs" recurse="true"> 2497 <Match pattern="*.cs" recurse="true">
2498 <Exclude name="Api"/>
2463 <Exclude name="Tests" pattern="Tests"/> 2499 <Exclude name="Tests" pattern="Tests"/>
2464 </Match> 2500 </Match>
2465 </Files> 2501 </Files>