aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Instance (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Change the IScriptApi back to it's original form, removing XEngineMelanie Thielker2015-08-171-6/+14
| | | | | specific additions that should not have been there in the first place. Sleeping and time measurement are now completely internal to XEngine
* Revert "When scripts are sleeping, don't count that as execution time"Melanie Thielker2015-08-171-7/+6
| | | | | | | The approach is good but the way it is written breaks the architecture. Rewrite follows. This reverts commit a568f06b7faea807149205d0e47454e4883e4836.
* Prevent the spammy "many event" message from appearing in normal use.Melanie Thielker2015-08-171-2/+4
| | | | | | Console command debug xengine now turns that on. Also, per orenh, remove the triggers at 1000 and 10000 as they are not useful now that top scripts works.
* When the user stops a script, have it remain stoppedOren Hurvitz2015-08-111-3/+18
| | | | | | Previously the script state was never saved for a !Running script, so upon region restart the script would be Running again. The use of the 'StayStopped' flag is needed because all scripts are automatically stopped when the region shuts down, but in that case we shouldn't save in their state that they're !Running.
* When scripts are sleeping, don't count that as execution timeOren Hurvitz2015-08-111-6/+7
| | | | Sleeping doesn't use the CPU.
* Show Script Time in the statistics panelOren Hurvitz2015-08-111-0/+1
| | | | The value shown is the number of milliseconds per frame that were spent executing scripts in this region.
* Changed "Script Execution Time" to be the gross time, i.e. including ↵Oren Hurvitz2015-08-111-164/+176
| | | | | | handling it in XEngine Previously the "Net Time" was reported: only the time actually spent in the script's code. This is not a correct indication of how much load the script places on the simulator, because scripts that change state often or have many events use up a lot of time just in the event handlers, and previously this time wasn't counted.
* Report "Script Execution Time" as the time spent executing the script in the ↵Oren Hurvitz2015-08-111-17/+12
| | | | | | | | last 30 seconds. Use a sliding window to calculate this. Notes: - This metric provides a better indication of which scripts are taking up a lot of CPU (and therefore should be optimized). - Previously the execution time was reset to 0 in every new measurement period, causing the reported time to fluctuate for no reason. This has been fixed by using a sliding window.
* Improved calculation of Script Execution TimeStartedOren Hurvitz2015-08-111-6/+12
| | | | | | 1. Use a Stopwatch (a high-resolution timer) 2. Whenever we start a new measurement period, zero out the total execution time (previously it just kept accumulating) 3. Changed the measurement period from 30 minutes to 30 seconds. This is much more useful in the "Top Scripts" dialog, as it shows currently active scripts
* Fixed mistakes related to confusion between Environment.TickCount ↵Oren Hurvitz2015-08-111-1/+1
| | | | (milliseconds) and TimeSpan.TicksPerXXX (10000 x milliseconds)
* Log scripts that have processed many events: this is probably an indication ↵Oren Hurvitz2015-08-111-0/+8
| | | | of a problem
* Updated all occurrences of AssemblyVersion("0.8.1.*") to ↵Diva Canto2015-04-291-1/+1
| | | | AssemblyVersion("0.8.2.*")
* Move state change in progress in ScriptInstance.PostEvent() to the top of ↵Justin Clark-Casey (justincc)2015-03-121-3/+4
| | | | the EventQueue lock to avoid some flags possibly being wrongly set (m_LastControlLevel, etc.)
* Lock around EventQueue manipulation in ScriptInstance.SetState() as queues ↵Justin Clark-Casey (justincc)2015-03-121-17/+24
| | | | | | are not thread-safe structures. This should also make it less likely that an event will be erroneously posted during a state change by precluding a race condition with a thread calling ScriptInstance.PostEvent()
* A workaround for the state change problem described best here ↵Bob Shaffer II2015-03-121-1/+22
| | | | http://opensimulator.org/mantis/view.php?id=6960 which should make state changes behave more like is described here http://wiki.secondlife.com/wiki/State
* corrected llGetStartParameter according to ↵Freaky Tech2015-03-031-0/+2
| | | | | | http://wiki.secondlife.com/wiki/LlGetStartParameter Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
* corrected llResetScript according to description within LSL wikiFreaky Tech2015-03-031-1/+2
| | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
* Avoid a possible race condition by serializing plugin data outside the ↵Justin Clark-Casey (justincc)2015-01-291-2/+9
| | | | | | | | EventQueue lock in ScriptInstance.SaveState() This takes the AsyncCommandHandler.staticLock. However, AsyncCommandHandler.DoOneCmdHandlerPass() already holds staticLock and may attempt to take the EventQueue lock via ScriptInstance.PostEvent() in XEngine.CheckListeners() This is a regression from faaf47a (Fri Jan 16 2015) but not simply reverting that commit since it will reintroduce a race between script removal, backup and event queue manipulating code.
* On a multi-region simulator when AppDomain = true, make sure the DLL from ↵Justin Clark-Casey (justincc)2015-01-262-80/+32
| | | | | | the appropriate script engines subdir is loaded rather than always that of the first engine to load the DLL. This resolves a DLL load failure on my Linux box when an attachment script was present on another region before the avatar arrived.
* Fix regression where the stored state of every second script in an object ↵Justin Clark-Casey (justincc)2015-01-231-0/+3
| | | | | | | rezzed from inventory (e.g. attachments) was no longer loaded. Likely a regression since f132f642 (2014-08-28) Relates to http://opensimulator.org/mantis/view.php?id=7278
* Prevent a race condition between the script engine backup thread and script ↵Justin Clark-Casey (justincc)2015-01-161-30/+40
| | | | | | removal by locking on the script's EventQueue and only proceeding if it's flagged as still running. Relates to http://opensimulator.org/mantis/view.php?id=7407
* For scripts in attachments, don't save .state files apart from the initial ↵Justin Clark-Casey (justincc)2015-01-161-5/+22
| | | | | | | | one as these are ignored since .state is saved in the attachment's asset. This eliminates pointless work and exceptions when an appdomain is unloaded whilst an attachment script state is persisted. Adds test for this case. Relates to http://opensimulator.org/mantis/view.php?id=7407
* minor: Add event name to existing debug output when a script event fails ↵Justin Clark-Casey (justincc)2015-01-081-1/+2
| | | | with an exception. To aid debugging.
* Fix a regression where objects crossing regions in the same simulator (on ↵Justin Clark-Casey (justincc)2014-12-101-30/+36
| | | | | | | | | | their own or as attachments) with AppDomainLoading = false would create the new state in the source region area rather than the dest. This was beause the code was finding the script DLL compiled for the source region as everything is in the same appdomain and using this as the location for the destination script state, etc. This resolves the regression by passing the proper destination separately from the DLL retrieved. Probably a regression since commit d7b92604 (11 July 2014). Added regression test for this case. At least partly addresses http://opensimulator.org/mantis/view.php?id=7278
* Always close script linemap file after reading and always dispose of other ↵Justin Clark-Casey (justincc)2014-12-031-4/+5
| | | | streams in the script engine even if exceptions are thrown.
* refactor: consistently put all test classes in the OpenSim.Tests.Common ↵Justin Clark-Casey (justincc)2014-11-251-1/+0
| | | | | | package rather than some in OpenSim.Tests.Common.Mock the separate mock package was not useful and was just another using line to always add
* minor: further cleanup of old vb and yield prolog script engine references ↵Justin Clark-Casey (justincc)2014-07-111-1/+1
| | | | that were removed some time ago
* If [XEngine] ScriptStopStrategy is changed between abort and co-op, for the ↵Justin Clark-Casey (justincc)2014-07-111-36/+21
| | | | | | | existing session use the previous strategy for that script rather than not starting the script at all. We have to do this since we can't unload existing DLLs if they're all in the same AppDomain. But we can still update the underlying DLL which will be used in the next simulator session.
* Change assembly versions to 0.8.1Justin Clark-Casey (justincc)2014-06-171-1/+1
|
* Change XEngine to call StateChange rather than RemoveScript on state changesMelanie2014-04-301-1/+1
|
* Better error messagesOren Hurvitz2014-03-241-6/+5
| | | | This resolves http://opensimulator.org/mantis/view.php?id=6936
* Bump OPenSimulator version and assembly versions up to 0.8.0 DevJustin Clark-Casey (justincc)2013-10-041-1/+1
|
* Remove exception when printing error for failure removing script state.Robert Adams2013-08-131-1/+1
|
* In co-op termination, extend EventWaitHandle to give this an indefinite ↵Justin Clark-Casey (justincc)2013-07-131-2/+21
| | | | | | | lifetime in order to avoid a later RemotingException if scripts are being loaded into their own domains. This is necessary because XEngineScriptBase now retains a reference to an EventWaitHandle when co-op termination is active. Aims to address http://opensimulator.org/mantis/view.php?id=6634
* Add in-code exaplanation for the change in cancellation signalling in STP ↵Justin Clark-Casey (justincc)2013-05-011-2/+0
| | | | 2.2.3. Remove left in Console.WriteLine accidentally inserted in recent 206fb306
* Update SmartThreadPool to latest version 2.2.3 with a major and minor change.Justin Clark-Casey (justincc)2013-05-011-3/+6
| | | | | | | | | | SmartThreadPool code comes from http://www.codeproject.com/Articles/7933/Smart-Thread-Pool This version implements thread abort (via WorkItem.Cancel(true)), threadpool naming, max thread stack, etc. so we no longer need to manually patch those. However, two changes have been made to stock 2.2.3. Major change: WorkItem.Cancel(bool abortExecution) in our version does not succeed if the work item was in progress and thread abort was not specified. This is to match previous behaviour where we handle co-operative termination via another mechanism rather than checking WorkItem.IsCanceled. Minor change: Did not add STP's StopWatch implementation as this is only used WinCE and Silverlight and causes a build clash with System.Diagnostics.StopWatch The reason for updating is to see if this improves http://opensimulator.org/mantis/view.php?id=6557 and http://opensimulator.org/mantis/view.php?id=6586
* minor: Log an exception if we aren't able to delete a script state file ↵Justin Clark-Casey (justincc)2013-04-091-1/+6
| | | | | | rather than simply ignoring it. This should never normally happen but if it does then it can be valuable diagonstic information.
* minor: remove some mono compiler warnings in script regression testsJustin Clark-Casey (justincc)2013-02-271-1/+0
|
* Deleted all AssemblyFileVersion directivesDiva Canto2013-02-191-1/+1
|
* 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.
* 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.
* 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
|
* 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
* 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.