635b1bf18e
Merge commit '601dabb1b73a894e4f2f61abe6e9053d380008cd' into bigmerge
2011-10-25 03:16:40 +01:00
85d40ce1d1
Merge commit '5607fd3af828846291de3358067bb1214619489e' into bigmerge
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2011-10-25 03:16:26 +01:00
df430d572d
Merge commit '3cf7fb4eca2ad57835311e8098868f2571709392' into bigmerge
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2011-10-25 03:10:54 +01:00
1bb0e3c800
Merge commit 'b45219065c7a81b3ec488b3a6734773c34268618' into bigmerge
...
Conflicts:
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2011-10-25 03:07:25 +01:00
1ec82bb000
Merge commit '116fbe8258e336be3f6ac1e11119214629799faa' into bigmerge
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
2011-10-25 03:06:18 +01:00
89e973805d
Merge commit 'ecad9f9fd589f90d1c7a20faf14af0304804b616' into bigmerge
2011-10-25 02:57:01 +01:00
69b480770a
Merge commit 'ee84c0589ccca1e7f3216ca1395c3002b773f30f' into bigmerge
...
Conflicts:
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2011-10-25 01:50:55 +01:00
8e69dde397
Merge commit 'ea7366ddc6f0e13519589fcaa3729fd36b5eef79' into bigmerge
...
Conflicts:
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2011-10-25 01:36:39 +01:00
601dabb1b7
Extend scripts stop/start/suspend/resume console commands to allow action on 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-19 22:30:31 +01:00
32c3faedd6
Add "scripts stop" and "scripts start" console commands.
...
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-19 21:40:28 +01:00
f836710af5
minor: improve command help on scripts suspend/resume
2011-10-19 21:34:55 +01:00
5607fd3af8
Fix resume scripts.
...
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-19 21:30:37 +01:00
3cf7fb4eca
Add "scripts suspend" and "scripts resume" commands.
...
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-19 20:53:24 +01:00
b45219065c
on log and "show scripts" messages, show script item UUID rather than asset UUID
...
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-19 20:26:05 +01:00
116fbe8258
add current script status to "scripts show" command (running, suspended, etc.)
2011-10-19 20:24:07 +01:00
ecad9f9fd5
Add "show scripts" command to show all scripts currently known to the script engine in the current region.
...
Also added synonym of "scripts show"
2011-10-19 20:09:02 +01:00
ee84c0589c
Don't execute rest of code in XEngine.RemoveRegion() and Close() if the module is disabled.
2011-10-14 01:06:43 +01:00
ea7366ddc6
When shutting down XEngine, log how many scripts are being shutdown so the user knows why they are waiting.
2011-10-12 19:42:04 +01:00
5484c9b585
Bring us up to date.
2011-09-14 19:11:32 -07:00
00f8946bd4
minor: if the script engine fails to find a prim for a script, also print out that prim's local id in the error message.
2011-09-12 22:44:14 +01:00
1dd904b78e
Delay loading scripts until the scene has finished loading
2011-09-09 23:01:05 +01:00
66dec3b874
Resolve merge commits, stage 1
2011-09-04 07:06:36 -07:00
cf3ffe5bb4
Fix llAttachToAvatar()
...
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-08-24 20:49:23 +01:00
61d4291da5
Create a method to force the script engine to save state from outside
2011-05-24 03:17:12 +01:00
d5841e07c2
Create a method to force the script engine to save state from outside
2011-05-24 02:40:59 +02:00
4beb0c9b9b
Merge branch 'master' into careminster-presence-refactor
2011-05-05 09:49:10 +01:00
d8ee0cbe1c
First stab at cleaning up Caps. Compiles. Untested.
2011-04-30 09:24:15 -07:00
c271bbcc8a
Preserve the script running flag when copying an object.
2011-01-08 16:44:28 +01:00
efc555ca22
Actually set the PrivateBinPath in XEngine so relocating the scripts
...
directory works
2010-10-16 10:50:07 +02:00
6f689f591a
Merge Master
2010-09-26 17:56:31 +01:00
4f25b73b57
Add configurable path to script engine assemblies
...
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>
2010-09-26 02:30:46 +01:00
6a1ce17cdb
Merge branch 'master' into careminster-presence-refactor
...
The modules will need to be updated for this to compile and run again. Please
don't use until I do the companion commit to modules later on.
2010-09-13 16:17:38 +01:00
f1f0bc23f4
Formatting cleanup.
2010-09-12 13:43:49 -04:00
1bfec00a88
Merge branch 'master' into careminster-presence-refactor
2010-08-23 23:55:15 +01:00
74e5fe5aa9
Remove various warnings and improve logging messages. No functional changes.
2010-08-23 22:24:23 +01:00
f0bad66d41
For my own sanity, fix a bug in xengine
2010-08-09 23:34:37 -07:00
686837d9ed
Merge branch 'master' into careminster-presence-refactor
2010-07-20 21:18:27 +01:00
b7f1288361
Adding it again.
...
Revert "Reverting this for now, but this needs to go in again."
This reverts commit c0d9ab941d
2010-07-20 04:23:39 -07:00
c0d9ab941d
Reverting this for now, but this needs to go in again.
...
Revert "Another stab at http://opensimulator.org/mantis/view.php?id=4858 . Eliminated more nested locks."
This reverts commit ffbae52a13
2010-07-19 16:22:29 -07:00
ffbae52a13
Another stab at http://opensimulator.org/mantis/view.php?id=4858 . Eliminated more nested locks.
2010-07-19 15:20:34 -07:00
5c0c7fda6c
One more stab at http://opensimulator.org/mantis/view.php?id=4858 .
...
Eliminated the nested locks of m_Scripts and m_PrimObjects.
2010-07-19 13:59:11 -07:00
fa45d5b5fa
Revert "A stab in the dark. Revert the compile lockout temporarily. If you know what"
...
This reverts commit f798679b80
2010-07-19 01:10:57 +01:00
f798679b80
A stab in the dark. Revert the compile lockout temporarily. If you know what
...
this is, you should test it. If you don't, don't use it.
2010-07-19 00:06:23 +01:00
922e874653
Merge branch 'master' into careminster-presence-refactor
2010-07-11 13:32:10 +01:00
6352fc5f57
Bug in 0.6.9 sometimes restoring script state causes region console to crash due to unhandled file lock exception. Attempt to resolve by wrapping several instances of file create / read logic in using statements and added some error handling for locked file exceptions. If it is IDisposable, it must be disposed! The close statements are unnecessary but harmless so I have left those in. The end of the using block will close and dispose automagically.
2010-07-09 18:23:48 +01:00
ec73074aac
Merge branch 'master' into careminster-presence-refactor
2010-07-02 03:02:53 +01:00
54d7f6ef43
Add region name on the end of script startup debug messages
2010-07-01 21:34:53 +01:00
46a531d865
Merge branch 'master' into careminster-presence-refactor
2010-06-30 21:35:05 +01:00
1db2921782
Fix scripts in rezzed objects not starting (Mantis #4775 )
2010-06-30 21:25:39 +01:00
6701fc2ffa
Fix the XML serializationt to provide an empty script state element if
...
the script hasn't yet saved state, or can't save state because of a loop
2010-06-29 21:50:52 +01:00
6b2d2413f7
Merge branch 'master' into careminster-presence-refactor
2010-06-09 16:48:37 +01:00
16439fa354
If a script is deleted before it gets compiled, don't even bother to try
...
compiling it
2010-06-09 03:51:43 +01:00
98cb4f74b2
Merge branch 'master' into careminster-presence-refactor
2010-04-19 07:00:40 +01:00
21cad5d3ac
All scripts are now created suspended and are only unsuspended when the object
...
is fully rezzed and all scripts in it are instantiated. This ensures that link
messages will not be lost on rez/region crossing and makes heavily scripted
objects reliable.
2010-04-19 06:29:26 +01:00
af265e001d
Formatting cleanup.
2010-02-15 19:21:56 +09:00
e9c9a74e0a
Some merge fixups
2010-01-26 15:12:41 +00:00
b80ea00265
Merge branch 'master' into careminster
2010-01-26 14:53:14 +00:00
38cfc9366c
Fix a problem where llDie() calls were sometimes leaving dead objects behind.
...
When an object was deleted, the remove script instance call was aggregating the scripting events as normal.
This would queue a full update of the prim before the viewer was notifed of the deletion of that prim (QuitPacket)
On some occasions, the QuitPacket would be sent before the full update was dequeued and sent.
In principle, you would think that a viewer would ignore updates for deleted prims. But it appears that in the Linden viewer (1.23.5),
a prim update that arrives after the prim was deleted instead makes the deleted prim persist in the viewer. Such prims have no properties
and cannot be removed from the viewer except by a relog.
This change stops the prim event aggregation call if it's being deleted anyway, hence removing the spurious viewer-confusing update.
2010-01-25 21:51:58 +00:00
61ce884336
Merge branch 'master' into careminster
2010-01-03 21:43:39 +00:00
70d5b1c34c
Formatting cleanup. Add copyright headers.
2010-01-04 06:17:30 +09:00
a9f4d7a29c
Add a debugger tag to stop Visual Studio from breaking
2009-12-23 17:34:08 +01:00
30f59370d3
Merge branch 'master' into careminster
2009-12-22 15:48:41 +00:00
c11f259e15
Remove GetState. It is really unused and was reinstated by the revert
2009-12-22 15:46:55 +00:00
a24d9bff03
Revert "Remove an insterface member that was never used"
...
It was used. By the API, which is dynamically loaded. So it didn't complain
until it hit Bamboo
This reverts commit 33d5018e94
2009-12-22 15:45:56 +00:00
73491cceed
Merge branch 'master' into careminster
2009-12-22 15:37:24 +00:00
33d5018e94
Remove an insterface member that was never used
2009-12-22 15:35:39 +00:00
28c7bb99bf
Merge branch 'master' into careminster
2009-12-22 09:30:50 +00:00
1876ce90af
FINALLY! Script compile errors now appear in the script error pane,
...
not in a funky debug window.
2009-12-22 09:24:01 +00:00
b53b871669
Add a data path for error messages
2009-12-22 06:25:32 +01:00
05e8b4e72c
Add a data path for error messages
...
Committed from my other box where git is not configured properly
Signed-off-by: Melanie <melanie@t-data.com>
2009-12-22 04:55:43 +00:00
df30b1c832
Merge branch 'master' into careminster
2009-12-21 10:28:50 +00:00
27453890d5
Script State Fix: Part 2
...
Change the reader to wrap old-style definitions in new style wrappers.
Change importer to not check irrelevant data that can't be reconstructed
This removes the last bit of knowledge of XEngine's .state files from core.
2009-12-21 10:26:52 +00:00
83d8ba5775
Remove extra checking on the itemID of saved state, since it changes during
...
rez from inventory.
2009-12-21 06:41:10 +00:00
f6ef487413
Script State Fix: Step 1
...
Add Engine=xxx attribute and check for it's presence. Ignore state data
written bby another engine
2009-12-21 06:29:23 +00:00
172e2f4e76
Fix to existing ReaderWriterLockSlim implementations
2009-12-06 17:23:07 +01:00
9888f95068
Convert multiple lock()s which directly hinder script performance in linksets to ReaderWriterLockSlim.
2009-11-30 21:17:15 +01:00
d3e7a52933
Merge branch 'master' into careminster
2009-11-28 09:26:00 +00:00
55a0896918
minor: remove mono compiler warning
2009-11-27 19:28:26 +00:00
06f41bb017
Merge branch 'master' into careminster
2009-11-26 17:27:03 +00:00
c6bfecccaa
Fix a small bug. Trusted script crossings now work again
2009-11-26 17:16:22 +00:00
9d63f90467
Remove the old (Remoting) region crossing code. Fix the new code to
...
pass script state and assembly again properly. Reintroduce respecting tht
TrustBinaries flag. Changes the interregion protocol! No version bump
because it was broken anyway, so with a version mismatch it will simply
stay broken, but not crash. Region corssing still doesn't work because
there is still monkey business with both rezzed prims being pushed across
a border and attached prims when walking across a border. Teleport is
untested by may work.
2009-11-26 17:03:09 +00:00
22c325aa5a
Remove GetAssemblyName and friends from the SE interface. It's now handled
...
internally
2009-11-26 13:13:48 +00:00
88842edc95
Remove GetAssemblyName and friends from the SE interface. It's now handled
...
internally
2009-11-26 12:08:20 +00:00
889ce36afa
Added some [DebuggerNonUserCode] modifiers to functions that throw EventAbortException() to ease debugging on Visual Studio
2009-11-23 17:59:24 +01:00
00130841db
Remove parallel loading from XEngine, but retain the new design where
...
all scripts are loaded from the same thread, rather than launching a
new one for each script. This is only marginally slower, but avoids the
race condition that led to script engine failure.
2009-11-03 20:23:50 +00:00
ec7fd8b1f8
More performance improvements to XEngine script loading
2009-10-29 06:42:40 -07:00
dd13fa361b
* Misc. formatting cleanup for the previous patch
...
* Added the new AppDomainLoading variable to the [XEngine] section in the example config
2009-10-29 05:56:37 -07:00
33448e4ba8
Optimizations
2009-10-29 05:39:18 -07:00
66923983a7
Add support for display of the script compilation errors in the script editor's
...
debug pane. This will still use DEBUG_CHANNEL currently, since it is not
fully implemented. This also removes the "Compiled successfully" message
that pops up in the viewer.
2009-10-17 22:36:44 +01:00
f1f239758f
Apply http://opensimulator.org/mantis/view.php?id=4066
...
If XEngine compile fails, show script name in error message in-world as well as the exception itself
Thanks Luca Peck
2009-10-09 17:43:25 +01:00
ee205e7e81
Formatting cleanup.
2009-10-01 01:17:47 +09:00
090868ff4a
Change the return value if the compiler to "object" to allow compilers
...
to return dynamic method objects
2009-08-31 11:42:54 +01:00
73b0cf492d
Add some extra info to script load messages
2009-08-14 01:35:14 +01:00
eba23048ca
Replace the Replaceable modules name
2009-08-10 23:08:22 +01:00
4ee8d8a813
Another stab at cmickeyb's patch for script GC.
...
Moved the Close() for the appdomain-hosted parts into a new destructor
on ScriptInstance.
2009-08-07 20:43:23 +01:00
f8d8366bfa
Revert the XEngine memleak patch, it causes premature GC.
...
This matches behavior seen with an earlier attempt to do this, apparently
the sponsor mechanism does't work in Mono
2009-08-07 03:04:06 +01:00
91f6898b26
|From: James J Greensky <jame.j.greensky@intel.com>
...
|Date: Wed, 5 Aug 2009 09:51:52 -0700
|Subject: [PATCH] Closed two major memory leaks for scripted objects
|
|Two major memory leaks for the scripted objects were fixed
|- One leak had to do with remoting acrossing app domains. When a script and
| its controlling agent communicate across an application boundary, it calls
| functions on a stub proxy object that then invokes the remote method on
| the object in the other app domain. These stub objects (two for each script)
| were setup to have infinate lifetimes and were never being garbage collected.
|- The second leak was the result of adding a scene object part instance method
| to a scene event and never removing it. This cause the event's delegate list
| to maintain a link to that object which is then never freed as the scene event
| object is never destroyed.
Patch applied, please direct feedback to me. Possible issue: Longtime idle
scripts like vendors may fail.
2009-08-06 22:03:20 +01:00
17bdc45c5c
Add plumbing for the SceneObjectDeleter to wait for the script engine to
...
allow final deletion of objects. Meant to support the attach(NULL_KEY) event,
2009-08-04 03:17:13 +01:00
8ecfc9a717
Committing the interface change and the addition to the modules to get
...
the ball rolling on replacable modules. No user functionality yet
2009-07-10 20:17:13 +00:00
98ea70644a
From: Alan Webb <alan_webb@us.ibm.com>
...
After noticing on several occasions that the thread counts
we see when running OpenSIm were bordering on the astronomical
I decided to seriously investigate.
After much poking I discovered that the problem is actually very
simple. The XEngine secition of the example ini says that the
timeout for an iden thread is in seconds, and an example value
of 60 is specified. In fact, this is actually resulting in a 60mS
idle timeout, which is not normally enough for a smart thread
to survive. I have added a multiplier to the XEngine constructor
so that the number now matches the published behavior.
2009-06-25 08:17:37 +00:00
Melanie