ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-06-28 09:55:38 +08:00
Code Issues Packages Projects Releases Wiki Activity
32,207 Commits 5 Branches 83 Tags
86dc93ec3ba287b1fac1ca87b0aaeee8028fa05d
Commit Graph

278 Commits

Author SHA1 Message Date
Justin Clark-Casey (justincc)
3a7d42378f Move state change in progress in ScriptInstance.PostEvent() to the top of the EventQueue lock to avoid some flags possibly being wrongly set (m_LastControlLevel, etc.) 2015-03-12 00:14:30 +00:00
Justin Clark-Casey (justincc)
7410924de0 Lock around EventQueue manipulation in ScriptInstance.SetState() as queues 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()
 2015-03-12 00:07:01 +00:00
Bob Shaffer II
b4b13510e8 A workaround for the state change problem described best here 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 2015-03-12 00:01:30 +00:00
Freaky Tech
25901a703a corrected llGetStartParameter according to http://wiki.secondlife.com/wiki/LlGetStartParameter 
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
 2015-03-03 15:35:23 -05:00
Freaky Tech
b8157174ca corrected llResetScript according to description within LSL wiki 
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
 2015-03-03 15:35:00 -05:00
Justin Clark-Casey (justincc)
b4e955d1c1 Avoid a possible race condition by serializing plugin data outside the 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.
 2015-01-29 17:55:08 +00:00
Justin Clark-Casey (justincc)
1bed3aff0b On a multi-region simulator when AppDomain = true, make sure the DLL from 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.
 2015-01-26 23:31:46 +00:00
Justin Clark-Casey (justincc)
d0a2ea0857 Fix regression where the stored state of every second script in an object 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
 2015-01-23 00:27:57 +00:00
Justin Clark-Casey (justincc)
faaf47a86f Prevent a race condition between the script engine backup thread and script 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
 2015-01-16 23:55:11 +00:00
Justin Clark-Casey (justincc)
8d724e90de For scripts in attachments, don't save .state files apart from the initial 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
 2015-01-16 22:46:48 +00:00
Justin Clark-Casey (justincc)
dbd500db42 minor: Add event name to existing debug output when a script event fails with an exception. To aid debugging. 2015-01-08 22:59:29 +00:00
Justin Clark-Casey (justincc)
2b9f0647de Fix a regression where objects crossing regions in the same simulator (on 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
 2014-12-10 00:25:27 +00:00
Justin Clark-Casey (justincc)
72d1d96c5c Always close script linemap file after reading and always dispose of other streams in the script engine even if exceptions are thrown. 2014-12-03 20:31:09 +00:00
Justin Clark-Casey (justincc)
fc878a33ed refactor: consistently put all test classes in the OpenSim.Tests.Common 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
 2014-11-25 23:21:37 +00:00
Justin Clark-Casey (justincc)
15b38f0036 minor: further cleanup of old vb and yield prolog script engine references that were removed some time ago 2014-07-11 00:15:47 +01:00
Justin Clark-Casey (justincc)
d7b9260496 If [XEngine] ScriptStopStrategy is changed between abort and co-op, for the 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.
 2014-07-11 00:03:02 +01:00
Justin Clark-Casey (justincc)
5450b1b024 Change assembly versions to 0.8.1 2014-06-17 18:37:15 +01:00
Melanie
7c121a2acc Change XEngine to call StateChange rather than RemoveScript on state changes 2014-04-30 20:56:49 +01:00
Oren Hurvitz
6734b94761 Better error messages 
This resolves http://opensimulator.org/mantis/view.php?id=6936
 2014-03-24 12:22:32 +01:00
Melanie
9800c6fa6c Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster 2013-10-06 18:33:49 +01:00
Melanie
69054ad134 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/Servers/VersionInfo.cs
	OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
 2013-10-06 18:32:20 +01:00
Justin Clark-Casey (justincc)
42bdf44658 Bump OPenSimulator version and assembly versions up to 0.8.0 Dev 2013-10-04 23:33:47 +01:00
Melanie
72206a0e29 Merge branch 'avination-current' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
	OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
 2013-09-16 22:32:53 +01:00
teravus
1c7accf950 * Fix a null ref that causes a stack unwind when crossing borders. Less stack unwinding.. the faster it goes. 
* Tweak XEngine so that it's partially functional again.    It's still not great, but basic things work.
(cherry picked from commit 01c3be2746)
 2013-09-16 11:32:05 -05:00
teravus
01c3be2746 * Fix a null ref that causes a stack unwind when crossing borders. Less stack unwinding.. the faster it goes. 
* Tweak XEngine so that it's partially functional again.    It's still not great, but basic things work.
 2013-08-24 05:55:53 -05:00
Melanie
4a6eff1ee8 Merge branch 'master' into careminster 2013-08-13 22:53:47 +01:00
Robert Adams
a90351cd2c Remove exception when printing error for failure removing script state. 2013-08-13 11:49:09 -07:00
Melanie
7830cc9954 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
	OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
	OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
	OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
	OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
	OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
	OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
	OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
	OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
	OpenSim/Services/HypergridService/UserAgentService.cs
 2013-07-18 10:08:10 +01:00
Justin Clark-Casey (justincc)
3d118fb580 In co-op termination, extend EventWaitHandle to give this an indefinite 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
 2013-07-13 00:02:54 +01:00
Melanie
8c5445b774 Merge branch 'master' into careminster 
Conflicts:
	ThirdParty/SmartThreadPool/SmartThreadPool.cs
 2013-05-01 21:39:49 +01:00
Justin Clark-Casey (justincc)
81a90e30c6 Add in-code exaplanation for the change in cancellation signalling in STP 2.2.3. Remove left in Console.WriteLine accidentally inserted in recent 206fb306 2013-05-01 19:29:46 +01:00
Justin Clark-Casey (justincc)
206fb306a7 Update SmartThreadPool to latest version 2.2.3 with a major and minor change. 
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
 2013-05-01 19:01:43 +01:00
Melanie
7cf377fff0 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Data/MySQL/MySQLAssetData.cs
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
	OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
 2013-04-10 13:20:55 +01:00
Justin Clark-Casey (justincc)
8690a08881 minor: Log an exception if we aren't able to delete a script state file rather than simply ignoring it. 
This should never normally happen but if it does then it can be valuable diagonstic information.
 2013-04-09 23:02:11 +01:00
Melanie
ba0819be9e Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
 2013-02-27 20:40:48 +00:00
Justin Clark-Casey (justincc)
61ba02e95f minor: remove some mono compiler warnings in script regression tests 2013-02-27 20:38:10 +00:00
Melanie
9534d5f929 Merge branch 'master' into careminster 2013-02-22 01:28:54 +00:00
Diva Canto
4779f7d7d5 Deleted all AssemblyFileVersion directives 2013-02-19 17:14:55 -08:00
Melanie
467e8d56b5 Merge branch 'master' into careminster 2013-02-12 23:21:26 +00:00
Justin Clark-Casey (justincc)
a82bd5678e Use an integer when specifying the XWorkItem wait rather than a TimeSpan to 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.
 2013-02-12 21:34:12 +00:00
Melanie
d3892bbd06 Merge branch 'master' into careminster 
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
 2013-02-05 21:30:12 +00:00
Justin Clark-Casey (justincc)
1f1da23097 Bump version and assembly version numbers from 0.7.5 to 0.7.6 
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.
 2013-02-05 00:23:17 +00:00
Melanie
9a4de546fe Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
 2013-01-31 02:53:11 +00:00
Justin Clark-Casey (justincc)
5ac84a3793 Fix issue where lsl -> c# generation in co-operative termination mode did 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.
 2013-01-30 03:52:22 +00:00
Justin Clark-Casey (justincc)
ccdf86c737 minor: remove EnableLogging() left over in CoopTerminationTests 2013-01-29 04:35:05 +00:00
Justin Clark-Casey (justincc)
b775761104 Disable the not very useful infinite recursion co-op termination tests for 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
 2013-01-24 00:31:42 +00:00
Melanie
2ce4a758e2 Merge branch 'master' into careminster 2013-01-24 00:27:00 +00:00
Melanie
be4c8c4931 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
 2013-01-24 00:25:08 +00:00
Justin Clark-Casey (justincc)
1a610f30d8 Fix mono 2.4.3 build break by using CreateInstanceAndUnwrap 9 method call deprecated in later .net versions 2013-01-24 00:23:12 +00:00
Justin Clark-Casey (justincc)
72dd3633ee Improve logging by making it clearer which script is failing if an assembly 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
 2013-01-23 23:34:15 +00:00