aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/prebuild.xml
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-01-16 02:07:43 +0000
committerJustin Clark-Casey (justincc)2013-01-16 02:07:43 +0000
commit0963ece25bdef16852f5fd8ae4515a2f05d8b6e4 (patch)
treef95a3eef3e94df4408d555a30cd62bce629623f2 /prebuild.xml
parentRevert "Implement co-operative script termination if termination comes during... (diff)
downloadopensim-SC-0963ece25bdef16852f5fd8ae4515a2f05d8b6e4.zip
opensim-SC-0963ece25bdef16852f5fd8ae4515a2f05d8b6e4.tar.gz
opensim-SC-0963ece25bdef16852f5fd8ae4515a2f05d8b6e4.tar.bz2
opensim-SC-0963ece25bdef16852f5fd8ae4515a2f05d8b6e4.tar.xz
Implement co-operative script termination if termination comes during a script wait event (llSleep(), etc.)
This makes use of EventWaitHandles since various web references indicate that Thread.Interrupt() can also cause runtime instability. If co-op termination is enabled, then termination sets the wait handle instead of waiting for a timeout before possibly aborting the thread. This allows the script to cleanly terminate if it's in a llSleep/LL function delay or the next time it enters such a wait without any timeout period. Co-op termination is not yet testable since checking for termination request within loops that never trigger a wait is not yet implemented. This commit, unlike 1b5c41c, passes the wait handle as an extra parameter through IScript.Initialize() instead of passing IScriptInstance itself.
Diffstat (limited to '')
-rw-r--r--prebuild.xml5
1 files changed, 4 insertions, 1 deletions
diff --git a/prebuild.xml b/prebuild.xml
index c6bef5c..abf8f36 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -2417,7 +2417,9 @@
2417 <Reference name="log4net" path="../../../../../bin/"/> 2417 <Reference name="log4net" path="../../../../../bin/"/>
2418 2418
2419 <Files> 2419 <Files>
2420 <Match pattern="*.cs" recurse="true"/> 2420 <Match pattern="*.cs" recurse="true">
2421 <Exclude name="Tests" pattern="Tests"/>
2422 </Match>
2421 </Files> 2423 </Files>
2422 </Project> 2424 </Project>
2423 2425
@@ -3309,6 +3311,7 @@
3309 <!-- SADLY the way this works means you need to keep adding these paths --> 3311 <!-- SADLY the way this works means you need to keep adding these paths -->
3310 <Match path="Shared/Tests" pattern="*.cs" recurse="true"/> 3312 <Match path="Shared/Tests" pattern="*.cs" recurse="true"/>
3311 <Match path="Shared/CodeTools/Tests" pattern="*.cs" recurse="true"/> 3313 <Match path="Shared/CodeTools/Tests" pattern="*.cs" recurse="true"/>
3314 <Match path="Shared/Instance/Tests" pattern="*.cs" recurse="true"/>
3312 <Match path="XEngine/Tests" pattern="*.cs" recurse="true"/> 3315 <Match path="XEngine/Tests" pattern="*.cs" recurse="true"/>
3313 </Files> 3316 </Files>
3314 </Project> 3317 </Project>