aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/XEngine (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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-1/+5
|\ \ | |/
| * Use an integer when specifying the XWorkItem wait rather than a TimeSpan to ↵Justin Clark-Casey (justincc)2013-02-121-1/+5
| | | | | | | | | | | | | | | | | | | | | | 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-2/+0
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
| * minor: remove some mono compile warnings in XEngine.csJustin Clark-Casey (justincc)2013-01-291-2/+0
| |
* | Merge branch 'master' into careminsterMelanie2013-01-261-2/+4
|\ \ | |/
| * Add OnScriptMovingStartEvent and OnScriptMovingEndEvent to EventManager so ↵Justin Clark-Casey (justincc)2013-01-261-2/+4
| | | | | | | | | | | | | | | | that these can be triggered by future code (not yet implemented). Also hooks up moving_start and moving_end script events, eliminating itemID on XEngine EventManager methods since this is completely unused. An adaptation of the patch in http://opensimulator.org/mantis/view.php?id=6515 Thanks Garmin Kawaguichi and Signpost Marv.
* | Merge branch 'master' into careminsterMelanie2013-01-244-18/+101
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * Merge branch 'master' into coopterminationJustin Clark-Casey (justincc)2013-01-241-2/+2
| |\
| * | Improve logging by making it clearer which script is failing if an assembly ↵Justin Clark-Casey (justincc)2013-01-232-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | 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-231-6/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | minor: comment out Console.WriteLine debugging message in XEngineJustin Clark-Casey (justincc)2013-01-221-1/+1
| | |
| * | refactor: rename XEngineTest to more descriptive XEngineBasicTestsJustin Clark-Casey (justincc)2013-01-221-0/+0
| | |
| * | Implement non-wait co-operative termination of scripts for XEngine in ↵Justin Clark-Casey (justincc)2013-01-172-1/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-231-2/+2
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Physics/BulletSNPlugin/BSShapeCollection.cs
| * | Assign the SmartThreadPool name in the constructorOren Hurvitz2013-01-191-2/+2
| |/ | | | | | | This is required because some threads are created in the constructor, so assigning the name afterwards would be too late.
| * Implement co-operative script termination if termination comes during a ↵Justin Clark-Casey (justincc)2013-01-161-0/+5
| | | | | | | | | | | | | | | | | | | | 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-161-5/+0
| | | | | | | | | | | | | | | | 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-161-0/+5
| | | | | | | | | | | | | | | | | | 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-5/+5
| | | | | | | | | | | | | | | | 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.
* | JustinCC's core re-mergeMelanie2013-01-161-5/+9
| |
* | Merge branch 'master' into careminsterMelanie2013-01-102-31/+164
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * Add "show script timers" command to show script timers. For debug purposes.Justin Clark-Casey (justincc)2013-01-101-3/+43
| | | | | | | | Also, "show sensors" changes to "show script sensors".
| * Add "show sensors" command to show script sensor information for debug purposes.Justin Clark-Casey (justincc)2013-01-102-0/+91
| |
| * minor: Fix command match of "debug script" command to "debug scripts" to ↵Justin Clark-Casey (justincc)2013-01-091-1/+1
| | | | | | | | match other scripts commands (and it's own short help text)
| * minor: Allow "script *" console commands to take multiple script item idsJustin Clark-Casey (justincc)2013-01-091-30/+32
| |
* | Merge branch 'master' into careminsterMelanie2013-01-021-0/+1
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * minor: Assign names to the different SmartThreadPools for debugging purposes.Justin Clark-Casey (justincc)2013-01-011-0/+1
| | | | | | | | | | A different approach to the patch in http://opensimulator.org/mantis/view.php?id=6462 that doesn't involve further forking of SmartThreadPool
* | Merge branch 'master' into careminsterMelanie2012-12-181-1/+1
|\ \ | |/
| * Extend default 1 second wait for event completion to other thread script ↵Justin Clark-Casey (justincc)2012-12-171-1/+1
| | | | | | | | | | | | | | | | 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-15/+73
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
| * Add WaitForEventCompletionOnScriptStop [XEngine] config param to ↵Justin Clark-Casey (justincc)2012-12-131-10/+24
| | | | | | | | | | | | | | OpenSimDefaults.ini to allow change of the wait time for an event to complete on script removal before aborting its thread Default is 1000, as has previously been the case. This parameter exists for further debug work concerning mono 2.10 crashes that may be related to locks not being removed on Thread.Abort
| * Add "debug script log" command to allow setting a numeric debug level on ↵Justin Clark-Casey (justincc)2012-12-121-5/+48
| | | | | | | | | | | | | | individual IScriptInstances for debugging purposes. Current, state changes and event fires can be logged for individual scripts. See command help for more details.
| * Add asset id to "show script" and "show scripts" command output to make it ↵Justin Clark-Casey (justincc)2012-12-121-0/+1
| | | | | | | | easier to extract and inspect the script's asset via "dump asset"
* | Merge branch 'master' into careminsterMelanie2012-12-071-12/+39
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * Add engine-wide events queued and events processed numbers to output of ↵Justin Clark-Casey (justincc)2012-12-051-1/+14
| | | | | | | | "xengine status" console command. For debugging purposes.
| * Add IScriptInstance.EventsQueued to match EventsProcessed instead of asking ↵Justin Clark-Casey (justincc)2012-12-051-4/+1
| | | | | | | | callers to lock and directly inspect the EventQueue
| * For now, sort "show scripts" output in descending order sorted by events ↵Justin Clark-Casey (justincc)2012-12-051-3/+21
| | | | | | | | | | | | processed. For debug purposes - should later add options to allow different sorting or show only highest 10, etc.
| * Add IScriptInstance.EventsProcessed stat so that we can record this ↵Justin Clark-Casey (justincc)2012-12-051-0/+1
| | | | | | | | information and display in "show scripts" for debug purposes
| * In XEngine.DoOnRezScript() use Culture.SetCurrentCulture() instead of ↵Justin Clark-Casey (justincc)2012-12-051-2/+1
| | | | | | | | constructing a new CultureInfo separately
| * On XEngine.ProcessEventHandler(), instead of creating a new CultureInfo on ↵Justin Clark-Casey (justincc)2012-12-051-2/+1
| | | | | | | | | | | | | | every call use the single one set by Culture.SetCurrentCulture() This is slightly different in that SetCurrentCulture() does not use overridden settings if the system culture matches en-US but some settings there have been changed. This is what we want - we do not want to use any system overriden settings.
* | Merge branch 'master' into careminsterMelanie2012-11-251-1/+1
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
| * Consistenly make NUnit test cases inherit from OpenSimTestCase which ↵Justin Clark-Casey (justincc)2012-11-241-1/+1
| | | | | | | | automatically turns off any logging enabled between tests
* | 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-10-311-2/+8
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Framework/TaskInventoryItem.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
| * Make "show object part" command correctly display script status.Justin Clark-Casey (justincc)2012-10-311-2/+8
| | | | | | | | | | Uses new IEntityInventory.TryGetScriptInstanceRunning() Makes it clearer that TaskInventoryItem.ScriptRunning cannot be used as it is temporary and not updated.