aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs
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 /OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs
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 'OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs
index 5164d4e..c88bad5 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs
@@ -94,7 +94,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
94 m_scene.AddSceneObject(so); 94 m_scene.AddSceneObject(so);
95 95
96 OSSL_Api osslApi = new OSSL_Api(); 96 OSSL_Api osslApi = new OSSL_Api();
97 osslApi.Initialize(new ScriptInstance(m_engine, part, null, 0, false, int.MaxValue)); 97 osslApi.Initialize(m_engine, part, null, null);
98 98
99 string notecardName = "appearanceNc"; 99 string notecardName = "appearanceNc";
100 100
@@ -135,7 +135,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
135 m_scene.AddSceneObject(so); 135 m_scene.AddSceneObject(so);
136 136
137 OSSL_Api osslApi = new OSSL_Api(); 137 OSSL_Api osslApi = new OSSL_Api();
138 osslApi.Initialize(new ScriptInstance(m_engine, part, null, 0, false, int.MaxValue)); 138 osslApi.Initialize(m_engine, part, null, null);
139 139
140 string notecardName = "appearanceNc"; 140 string notecardName = "appearanceNc";
141 141