aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs (unfollow)
Commit message (Collapse)AuthorFilesLines
2012-06-28If rest of first line after colon is blank then still warn about running in ↵Justin Clark-Casey (justincc)1-11/+18
XEngine if engine specified does not exist. This is to take account of situations where the user was intending to specify a script engine using colon using its default language. This probably generates few false positive as scripts are less likely to end a first line colon with a comment for other purposes.
2012-06-28Avoid reporting false positives when a colon is in a comment in the first ↵Justin Clark-Casey (justincc)1-17/+41
line of a script where the user was not trying to select a different script engine. This works by only posting the "Selected engine unavailable" message if we're falling back on XEngine and the language is one handled by XEngine. In cases where the language is not handled or not allowed, the user will still be notified by the later compiler error. This avoids the overwhelming majority of false positives where the first line contains a : for other reasons (e.g. source control systems, vim settings, etc.) Ultimately, I think it would be better to detect script language/engine with a mechanism that didn't just rely on : detection (e.g like #! in unix scripts).
2012-06-28minor: reuse colon index calculation in XEngine.OnRezScript. The index if a ↵Justin Clark-Casey (justincc)1-2/+2
colon is found on the first line will always be the same as for the whole script.
2012-06-23Fix script "Running" behaviorBlueWall1-0/+7
Unchecking "Running" box in script editor now persists. This fixes http://opensimulator.org/mantis/view.php?id=6057
2012-06-22Avoid race condition between m_PrimObjects iteration in ↵Justin Clark-Casey (justincc)1-14/+14
XEngine.PostObjectEvent and places where the list is modified by extending the m_PrimObjects lock.
2012-06-22If starting scripts on initial sim start, provide INFO level log feedback ↵Justin Clark-Casey (justincc)1-6/+10
each time 50 scripts have been started. This is to provide an indication of what's happening now that the default isn't to report every single script start. Changes XEngine logging level in OpenSim.exe.config from WARN to INFO.
2012-06-22Eliminate unnecessary extra call to TriggerEmptyScriptCompileQueue in ↵Justin Clark-Casey (justincc)1-9/+2
XEngine.DoOnRezScriptQueue() The later invocation of this function will happen on an empty compile queue.
2012-06-20Comment out recently added log message detailing number of scripts started ↵Justin Clark-Casey (justincc)1-2/+2
when compile queue empties for now
2012-06-20Raise some IO associated Exception logging in XEngine to error level, in ↵Justin Clark-Casey (justincc)1-7/+5
line with other similar cases. Remove more unnecessary Close() calls - these are being triggered by the Dispose() called when exiting the using statement for these sdk io objects.
2012-06-20Log how many scripts are candidates for starting and how many are actually ↵Justin Clark-Casey (justincc)1-4/+60
started. Adds DebugLevel infrastructure to XEngine though currently commented out and unused.
2012-06-19Like the assembly and text files, only write the c#-lsl linemap in ↵Justin Clark-Casey (justincc)1-27/+27
XEngine.SetXMLState() if the trust binaries flag is set. This doesn't affect other locations where the map is written, such as on script compilation.
2012-06-19minor: Add a little more detail to IOException logging in XEngine.SetXMLState()Justin Clark-Casey (justincc)1-11/+14
Also removes superflous Close() commands for statements taking place within using() constructs Also adds some comment out debug log messages for future use.
2012-04-24Minor improvements to loggingOren Hurvitz1-3/+5
Eliminated an extra newline in the console if the log line doesn't contain a category (example of a category: "[ASSETS]").
2012-04-18Fix a logic error in app domain creationMelanie1-1/+1
2012-04-18Don't re-add the assembly resolver for each script if not creating the appdomainMelanie1-4/+8
2012-04-12Mantis 55025 Implement script time.Talun1-34/+48
Signed-off-by: nebadon <michael@osgrid.org>
2012-03-19Stop console command "xengine status" throwing an exception if there are no ↵Justin Clark-Casey (justincc)1-4/+4
scripts in a region. Addresses http://opensimulator.org/mantis/view.php?id=5940
2012-03-16refactor: separate out console and status report generation parts of XEngineJustin Clark-Casey (justincc)1-1/+6
2012-03-16Aggregate script execution times by linksets rather than individual prims.Justin Clark-Casey (justincc)1-3/+2
This is for the top scripts report.
2012-03-16Replace script-lines-per-second with the script execution time scaled by its ↵Justin Clark-Casey (justincc)1-0/+53
measurement period and an idealised frame time. The previous lines-per-second measurement used for top scripts report was inaccurate, since lines executed does not reflect time taken to execute. Also, every fetch of the report would reset all the numbers limiting its usefulness and we weren't even guaranteed to see the top 100. The actual measurement value should be script execution time per frame but XEngine does not work this way. Therefore, we use actual script execution time scaled by the measurement period and an idealised frame time. This is still not ideal but gives reasonable results and allows scripts to be compared. This commit moves script execution time calculations from SceneGraph into IScriptModule implementations.
2012-03-15Fix a problem where multiple near simultaneous calls to llDie() from ↵Justin Clark-Casey (justincc)1-10/+9
multiple scripts in the same linkset can cause unnecessary thread aborts. The first llDie() could lock Scene.m_deleting_scene_object. The second llDie() would then wait at this lock. The first llDie() would go on to remove the second script but always abort it since the second script's WorkItem would not go away. Easiest solution here is to remove the m_deleting_scene_object since it's no longer justified - we no longer lock m_parts but take a copy instead. This also requires an adjustment in XEngine.OnRemoveScript not to use instance.ObjectID instead when firing the OnObjectRemoved event.
2012-03-15Alleviate an issue where calling Thread.Abort() on script WorkItems can fail ↵Justin Clark-Casey (justincc)1-1/+5
to release locks, resulting in a crippled simulator. This seems to be a particular problem with ReaderWriterLockSlim, though other locks can be affected as well. It has been seen to happen when llDie() is called in a linkset running more than one script. Alleviation here means supplying a ScriptInstance.Stop() timeout of 1000ms rather than 0ms, to give events a chance to complete. Also, we check the IsRunning status at the top of the ScriptInstance.EventProcessor() so that another event doesn't start in the mean time. Ultimately, a better solution may have to be found since a long-running event would still exceed the timeout and be aborted.
2012-03-14refactor: rename ScriptInstance.m_CurrentResult to m_CurrentWorkItem to make ↵Justin Clark-Casey (justincc)1-1/+0
it more understandable as to what it is and what it does (hold a thread pool work item for a waiting of in-progress event) Also add other various illustrative comments
2012-03-12Add max thread and min thread information to "xengine status" region console ↵Justin Clark-Casey (justincc)1-0/+2
command
2012-03-08Change "help" to display categories/module list then "help ↵Justin Clark-Casey (justincc)1-7/+7
<category/module>" to display commands in a category. This is to deal with the hundred lines of command splurge when one previously typed "help" Modelled somewhat on the mysql console One can still type help <command> to get per command help at any point. Categories capitalized to avoid conflict with the all-lowercase commands (except for commander system, as of yet). Does not affect command parsing or any other aspects of the console apart from the help system. Backwards compatible with existing modules.
2012-03-06Add sensor, dataserver requests, timer and listener counts to "xengine ↵Justin Clark-Casey (justincc)1-0/+15
status" command. This is for diagnostic purposes.
2012-02-07Add a regression test to compile and start a script. Remove ↵Justin Clark-Casey (justincc)1-2/+21
Path.GetDirectoryName when getting assembly loading path in Compiler.CompileFromDotNetText(). The Path.GetDirectoryName call in Compiler.CompileFromDotNetText is unnecessary since AppDomain.CurrentDomain.BaseDirectory is always a directory. Later path concatenation is already done by Path.Combine() which handles any trailing slash. Removing Path.GetDirectoryName() will not affect the runtime but allows NUnit to work since it doesn't add a trailing slash to AppDomain.CurrentDomain.BaseDirectory.
2012-02-01Lay out script status in property per row format, since getting too long for ↵Justin Clark-Casey (justincc)1-6/+12
console lines.
2012-02-01Add count of events queued for a particular script in "scripts show" console ↵Justin Clark-Casey (justincc)1-4/+9
command
2012-02-01Make script console commands only show for selected region.Justin Clark-Casey (justincc)1-0/+9
2012-02-01Implement "xengine status" console command to show various xengine statsJustin Clark-Casey (justincc)1-4/+28
2012-01-14Extend scripts show command to accept a single item UUID parameter to ↵Justin Clark-Casey (justincc)1-40/+47
display one script's status Usage is now scripts show [<script-item-uuid>]
2011-11-17If the entire simulator is shutting down then don't bother to unload the ↵Justin Clark-Casey (justincc)1-7/+19
scripts from the appdomain in XEngine. All the other actions (script state save, etc.) still occur. This makes shutdown where there are many scripts vastly quicker.
2011-10-27For now, comment out error message on new script engine console commands.Justin Clark-Casey (justincc)1-1/+4
This causes false positives if a simulator has more than 1 region and the current region is 'root' since this sends the command separately to each region and each region has its own XEngine
2011-10-19Extend scripts stop/start/suspend/resume console commands to allow action on ↵Justin Clark-Casey (justincc)1-67/+91
a single script by giving the script item id (which can be found via scripts show). Not an ideal way to do this on a region with many scripts. Needs refinement later.
2011-10-19Add "scripts stop" and "scripts start" console commands.Justin Clark-Casey (justincc)1-2/+48
These will stop all running scripts and start all stopped scripts respectively. A stopped script does not save any events for later processing.
2011-10-19minor: improve command help on scripts suspend/resumeJustin Clark-Casey (justincc)1-2/+5
2011-10-19Fix resume scripts.Justin Clark-Casey (justincc)1-1/+1
On resume, we need to place requeue the script for event processing if there are any events on the queue. Also need to do this under m_Script lock in order to avoid a race
2011-10-19Add "scripts suspend" and "scripts resume" commands.Justin Clark-Casey (justincc)1-1/+49
These aim currently to suspend and resume all scripts. However, resume isn't currently working due to what looks like a bug in resume functionality itself.
2011-10-19on log and "show scripts" messages, show script item UUID rather than asset UUIDJustin Clark-Casey (justincc)1-4/+4
The item ID is the one required for any script manipulation on the command line, so I think it's somewhat more useful to show this bearing in mind the limited space available
2011-10-19add current script status to "scripts show" command (running, suspended, etc.)Justin Clark-Casey (justincc)1-2/+20
2011-10-19Add "show scripts" command to show all scripts currently known to the script ↵Justin Clark-Casey (justincc)1-0/+28
engine in the current region. Also added synonym of "scripts show"
2011-10-14Don't execute rest of code in XEngine.RemoveRegion() and Close() if the ↵Justin Clark-Casey (justincc)1-0/+6
module is disabled.
2011-10-12When shutting down XEngine, log how many scripts are being shutdown so the ↵Justin Clark-Casey (justincc)1-1/+4
user knows why they are waiting.
2011-09-12minor: if the script engine fails to find a prim for a script, also print ↵Justin Clark-Casey (justincc)1-1/+1
out that prim's local id in the error message.
2011-09-09Delay loading scripts until the scene has finished loadingOren Hurvitz1-0/+3
2011-08-24Fix llAttachToAvatar()Justin Clark-Casey (justincc)1-0/+9
Apart from one obvious bug, this was failing because attempting to serialize the script from inside the script (as part of saving the attachment as an inventory asset) was triggering an extremely long delay. So we now don't do this. The state will be serialized anyway when the avatar normally logs out. The worst that can happen is that if the client/server crashes, the attachment scripts start without previous state.
2011-05-24Create a method to force the script engine to save state from outsideMelanie1-4/+9
2011-04-30First stab at cleaning up Caps. Compiles. Untested.Diva Canto1-2/+1
2010-09-26Add configurable path to script engine assembliesBlueWall1-10/+17
Adding ability to place script engine assemblies outside the codebase directories. Uses new [XEngine] option: ScriptEnginesPath = "path_to_assemblies" Signed-off-by: Melanie <melanie@t-data.com>