aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Instance (follow)
Commit message (Collapse)AuthorAgeFilesLines
* * Fix a null ref that causes a stack unwind when crossing borders. Less ↵teravus2013-08-241-0/+1
| | | | | | stack unwinding.. the faster it goes. * Tweak XEngine so that it's partially functional again. It's still not great, but basic things work.
* Merge branch 'master' into careminsterMelanie2013-02-271-1/+0
|\ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
| * minor: remove some mono compiler warnings in script regression testsJustin Clark-Casey (justincc)2013-02-271-1/+0
| |
* | Merge branch 'master' into careminsterMelanie2013-02-221-1/+1
|\ \ | |/
| * Deleted all AssemblyFileVersion directivesDiva Canto2013-02-191-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2013-02-121-2/+2
|\ \ | |/
| * Use an integer when specifying the XWorkItem wait rather than a TimeSpan to ↵Justin Clark-Casey (justincc)2013-02-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | avoid a Windows casting issue in SmartThreadPool for large TimeSpans. TimeSpan.Milliseconds is an int64. However, STP casts this to an int (32-bit). If TimeSpan.MaxValue is given then the casting results in an invalid value for the SDK WaitHandle.WaitAll() call. This was causing the co-op script termination regression tests to fail on Windows but not Mono 2.10.8 (which is perhaps not strict in the negative values that it accepts). Solution here is to use the int millisecondsTimeout STP call rather than the TimeSpan one. This also allows us to more clearly specify Timeout.Infinite rather than TimeSpan.MaxValue Thanks to Teravus for this spot.
* | Merge branch 'master' into careminsterMelanie2013-02-051-1/+1
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * Bump version and assembly version numbers from 0.7.5 to 0.7.6Justin Clark-Casey (justincc)2013-02-051-1/+1
| | | | | | | | | | | | | | | | This is mostly Bluewall's work but I am also bumping the general version number OpenSimulator 0.7.5 remains in the release candidate stage. I'm doing this because master is significantly adding things that will not be in 0.7.5 This update should not cause issues with existing external binary DLLs because our DLLs do not have strong names and so the exact version match requirement is not in force.
* | Merge branch 'master' into careminsterMelanie2013-01-311-14/+151
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
| * Fix issue where lsl -> c# generation in co-operative termination mode did ↵Justin Clark-Casey (justincc)2013-01-301-13/+150
| | | | | | | | | | | | | | not correctly handle single statement versions of for, while and do-while loops. Add regression tests to validate the fix. This problem will not affect the default abort termination mode.
| * minor: remove EnableLogging() left over in CoopTerminationTestsJustin Clark-Casey (justincc)2013-01-291-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2013-01-242-2/+7
|\ \ | |/
| * Disable the not very useful infinite recursion co-op termination tests for ↵Justin Clark-Casey (justincc)2013-01-241-2/+6
| | | | | | | | | | | | now as they appear to cause failures with testing in jenkins. These tests are not very useful anyway as they never actually get a chance to try termination before the script runs out of stack
| * Fix mono 2.4.3 build break by using CreateInstanceAndUnwrap 9 method call ↵Justin Clark-Casey (justincc)2013-01-241-0/+1
| | | | | | | | deprecated in later .net versions
* | Merge branch 'master' into careminsterMelanie2013-01-242-41/+307
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * Improve logging by making it clearer which script is failing if an assembly ↵Justin Clark-Casey (justincc)2013-01-231-19/+23
| | | | | | | | | | | | | | | | fails to load. Moves the noise co-op start/stop debug log messages to only display if xengine debug level >= 1 Logs which stop strategy is being used (abort or co-op) Adjusts some other logging to remove not very useful stuff
| * If ScriptStopStrategy hasn't been set to co-op in [XEngine] config, then ↵Justin Clark-Casey (justincc)2013-01-232-9/+41
| | | | | | | | | | | | | | | | | | continue to generate C# that is functionality identical to historical generation This is to eliminate disruption until co-op termination has been well-tested. In non co-op mode, XEngine will continue to load DLLs of the existing Script class and the new XEngineScript class. Moving to co-op mode still requires existing script DLL deletion to force recompilation, either manually or by setting DeleteScriptsOnStartup = true for one run. This change also means that scripts which fail to initialize do not still show up as running scripts.
| * Add co-op termination regression test for infinite recursive manual call on ↵Justin Clark-Casey (justincc)2013-01-221-0/+22
| | | | | | | | | | | | event function. Such code would normally terminate quickly with a stack overflow exception anyway.
| * Set script delay factor to 0 in co-op termination testsJustin Clark-Casey (justincc)2013-01-221-0/+3
| | | | | | | | | | This is to ensure loops aren't actually terminating from a wait on an LSL function. This was not the case with any of the existing tests.
| * Add regression test for co-op termination on infinite user function call ↵Justin Clark-Casey (justincc)2013-01-221-0/+30
| | | | | | | | | | | | regression. Such a script would probably run out of stack pretty quickly anyway.
| * Add regression test for co-op stop of an infinite jump loopJustin Clark-Casey (justincc)2013-01-221-8/+41
| | | | | | | | | | | | | | Also fixes bug in do-while test Improves detection of failure due to invalid script in test Sets up xengine anew for each test rather than once for the while testsuite to improve isolation between tests. Stop listening for chat after the first 'script is running' chat is received to reduce test run time.
| * Add do-while co-op termination testJustin Clark-Casey (justincc)2013-01-221-2/+30
| | | | | | | | Minor changes to scripts in other tests.
| * Add single and comound while loop co-op termination testJustin Clark-Casey (justincc)2013-01-221-0/+44
| |
| * Fix bug in generating termination checks in compound statement for loop.Justin Clark-Casey (justincc)2013-01-221-2/+26
| | | | | | | | Add regression test for this case.
| * factor out common code in existing co-op termination regression testsJustin Clark-Casey (justincc)2013-01-221-55/+24
| |
| * Increase WaitForEventCompletionOnScriptStop to 120 secs to show that the ↵Justin Clark-Casey (justincc)2013-01-221-0/+4
| | | | | | | | co-op setting is active in its regression tests.
| * Add regression test TestStopOnLongForLoop()Justin Clark-Casey (justincc)2013-01-221-0/+59
| |
| * Implement non-wait co-operative termination of scripts for XEngine in ↵Justin Clark-Casey (justincc)2013-01-171-5/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Merge branch 'master' into careminsterMelanie2013-01-161-0/+157
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Instance/Tests/CoopTerminationTests.cs
| * Implement co-operative script termination if termination comes during a ↵Justin Clark-Casey (justincc)2013-01-162-4/+207
| | | | | | | | | | | | | | | | | | | | 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.
| * Revert "Implement co-operative script termination if termination comes ↵Justin Clark-Casey (justincc)2013-01-162-206/+3
| | | | | | | | | | | | | | | | during a script wait event (llSleep(), etc.)" Doing this as a favour to Melanie. This will be back with passing the wait handles directly to the api. This reverts commit 1b5c41c14ad11325be249ea1cce3c65d4d6a89be.
| * Implement co-operative script termination if termination comes during a ↵Justin Clark-Casey (justincc)2013-01-162-3/+206
| | | | | | | | | | | | | | | | | | 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.
| * Instead of passing separate engine, part and item components to script APIs, ↵Justin Clark-Casey (justincc)2013-01-151-23/+29
| | | | | | | | | | | | | | | | pass down IScriptInstance instead. This is to allow the future co-operative script thread terminate feature to detect and act upon termination requests. This splits the assembly and state loading out from the ScriptInstance() constructor to a separate Load() method in order to facilititate continued script logic regression testing.
| * refactor: Simplify ScriptInstance by retaining reference to SceneObjectPart ↵Justin Clark-Casey (justincc)2013-01-141-72/+55
| | | | | | | | instead of sometimes but not always looking it up.
* | JustinCC's core re-mergeMelanie2013-01-161-28/+80
| |
* | Merge branch 'master' into careminsterMelanie2012-12-181-2/+2
|\ \ | |/
| * Extend default 1 second wait for event completion to other thread script ↵Justin Clark-Casey (justincc)2012-12-171-2/+2
| | | | | | | | | | | | | | | | reset (as called by llResetOtherScript()). As with script stop (via llDie()) aborting other scripts event threads, llResetOtherScript() can also abort any current event thread on another script. On mono 2.6, 2.10 and possibly later this may cause locking problems in certain code areas. This commit reuses the recently introduced [XEngine] WaitForEventCompletionOnScriptStop to make this a 1 sec timeout, rather than 0 secs.
* | Merge branch 'master' into careminsterMelanie2012-12-161-9/+31
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
| * Log situations where workitem event threads are aborted on stop request ↵Justin Clark-Casey (justincc)2012-12-121-3/+3
| | | | | | | | | | | | because they failed to complete event processing within the given timeout. This is for bug hunting purposes where thread aborts may be causing dangling lock issues and subsequent vm crashes on mono (with ReaderWriterLockSlim, etc.)
| * Add "debug script log" command to allow setting a numeric debug level on ↵Justin Clark-Casey (justincc)2012-12-121-8/+29
| | | | | | | | | | | | | | individual IScriptInstances for debugging purposes. Current, state changes and event fires can be logged for individual scripts. See command help for more details.
* | Merge branch 'master' into careminsterMelanie2012-12-071-1/+24
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * Instead of printing script errors out to console, put to debug log so that ↵Justin Clark-Casey (justincc)2012-12-061-1/+11
| | | | | | | | | | | | | | | | we also get timestamps. This commit also adds script name, part name, uuid, etc. for later identification. This information has been sent to console since 2009 but may be turned down if it proves too noisy. However, I still currently need it to investigate some region problems probably triggered by scripting.
| * Add IScriptInstance.EventsQueued to match EventsProcessed instead of asking ↵Justin Clark-Casey (justincc)2012-12-051-0/+9
| | | | | | | | callers to lock and directly inspect the EventQueue
| * Add IScriptInstance.EventsProcessed stat so that we can record this ↵Justin Clark-Casey (justincc)2012-12-051-0/+4
| | | | | | | | information and display in "show scripts" for debug purposes
* | Merge branch 'master' into careminsterMelanie2012-11-151-0/+33
|\ \ | |/
| * Added AssemblyInfos to every dll in the OpenSim.Region namespace.Diva Canto2012-11-141-0/+33
| |
* | Merge branch 'master' into careminsterMelanie2012-07-191-6/+8
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * Make the scrpt running flag work properlyMelanie2012-07-171-6/+8
| |
* | Merge branch 'master' into careminsterMelanie2012-07-162-20/+0
|\ \ | |/
generated by cgit v1.1 at 2024-12-23 06:34:15 +0000