ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-25 11:15:42 +08:00
Code Issues Packages Projects Releases Wiki Activity
20,818 Commits 5 Branches 93 Tags
a79bafaaaf3df2a0e1663bf9317ee53eb06db204
Commit Graph

66 Commits

Author SHA1 Message Date
Melanie
211f4fb411 Sequence inventory descendents requests to reduce inventory server load and 
movement lag.
 2012-08-30 00:34:12 +02:00
Melanie
74465df43f Fix issue with the quit packet being stuck int he queue and a one packet delay. 
Also fix semaphore excetion caused by enqueueing while dequque is taking place.
 2012-08-29 11:45:28 +02:00
Melanie
34f0694938 Remove Justin's addition to avoid sending incoming packets to inactive clients 
This also causes the initial AgentUpdate to be rejected because our processing
is asynchronous.
 2012-08-29 11:35:21 +02:00
Melanie
378a79e7cc Add a queue with two priority levels. This is a drop in replacement for 
the BlockingQueue from OMV, but allows two priorities.
 2012-08-28 22:17:17 +02:00
Melanie
771d79e83e Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/Monitoring/BaseStatsCollector.cs
	OpenSim/Region/Application/OpenSim.cs
	OpenSim/Region/Application/OpenSimBase.cs
	OpenSim/Region/Framework/Scenes/SceneManager.cs
	bin/OpenMetaverse.Rendering.Meshmerizer.dll
	bin/OpenMetaverse.StructuredData.dll
	bin/OpenMetaverse.dll
	bin/OpenMetaverseTypes.dll
	prebuild.xml
 2012-07-28 00:39:36 +01:00
Justin Clark-Casey (justincc)
35efa88c26 Rename OpenSim.Framework.Statistics to OpenSim.Framework.Monitoring. 
This better reflects the long-term purpose of that project and matches Monitoring modules.
 2012-07-25 23:11:50 +01:00
Melanie
112df30ea3 Merge branch 'avination' into careminster 2012-07-23 19:32:08 +01:00
Melanie
b1b3057adc Fix double-ping on logout by not sending a stop packet to the client 
if the client told us it wants to log out in the first place.
 2012-07-21 20:56:19 +02:00
Melanie
7da744566d Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
 2012-07-20 09:31:06 +01:00
Justin Clark-Casey (justincc)
ba80f137b5 Prevent race conditions between two threads that call LLClientView.Close() simultaneously (e.g. ack timeout and an attempt to reconnect) 2012-07-19 22:32:27 +01:00
Melanie
c256447f46 Merge branch 'avination' into careminster 
Conflicts:
	OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
 2012-07-16 22:22:42 +01:00
Melanie
668723fab3 Remove instrumentation and fix the message delivery issue 2012-07-15 23:01:58 +02:00
Melanie
b130dcea21 Testing changes and instrumentation 2012-07-15 22:28:47 +02:00
Melanie
283df0610d Save packets received while the client is added and replay them later. 2012-07-15 21:45:06 +02:00
Melanie
8b4f7604e6 Revert "Experimentally handle UseCircuitCode synchrnonously" 
This reverts commit e3fa73da96.
 2012-07-15 19:45:08 +02:00
Melanie
e3fa73da96 Experimentally handle UseCircuitCode synchrnonously 2012-07-15 17:17:59 +02:00
Melanie
64393a7ca8 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
 2012-07-13 02:27:16 +01:00
Justin Clark-Casey (justincc)
d6f54b25cd Stop redundantly passing in the endpoint to the LLClientView constructor. 
This can always be retrieved via the LLUDPClient and is so done in various places already.
 2012-07-12 23:48:42 +01:00
Melanie
26d89777d8 Merge branch 'avination' into careminster 
Conflicts:
	OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
	OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2012-07-06 20:51:18 +01:00
Melanie
5776351f6a Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2012-07-05 22:17:39 +01:00
Justin Clark-Casey (justincc)
5691a8b860 refactor: rename Watchdog.WATCHDOG_TIMEOUT_MS to DEFAULT_WATCHDOG_TIMEOUT_MS to reflect what it actually is 2012-07-04 00:15:03 +01:00
UbitUmarov
1468b01afc coment out some of previus debug messaged before forgetting about them... 2012-06-22 18:29:46 +01:00
UbitUmarov
646b7fb8f2 i more debug 2012-06-22 18:10:53 +01:00
UbitUmarov
ba58d7a9b2 add a temp debug message 2012-06-22 18:04:12 +01:00
Melanie
32cc9c6094 Merge branch 'master' into careminster 2012-06-15 15:59:49 +01:00
Justin Clark-Casey (justincc)
aaa30dcebc Add region name to UseCircuitCode log messages 2012-06-15 05:01:36 +01:00
Melanie
dfafb5ca14 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
 2012-06-12 03:09:52 +01:00
Justin Clark-Casey (justincc)
2ca31a9841 Remove accidental timeout left in during earlier debugging. Has been in since two commits ago (b099f26) 2012-06-12 02:46:14 +01:00
Justin Clark-Casey (justincc)
b099f26376 Set IClientAPI.IsActive = false early on client removal due to ack timeout rather than using IsLoggingOut flag. 
IsActive is more appropriate since unack timeout is not due to voluntary logout.
This is in line with operations such as manual kick that do not set the IsLoggingOut flag.
It's also slightly better race-wise since it reduces the chance of this operation clashing with another reason for client deactivation (e.g. manual kick).
 2012-06-12 02:16:36 +01:00
Justin Clark-Casey (justincc)
c89db34fc4 If the simulator closes a root agent due to ack timeout, then send the client a kick message with that reason, in case it is somehow still listening. 2012-06-12 02:03:31 +01:00
Melanie
8c91e761c8 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
 2012-06-09 16:28:22 +01:00
Justin Clark-Casey (justincc)
f94b92df46 Instead of retrieving the known client again in LLUDPServer.RemoveClient(), check the IsLoggingOut flag instead. 
This is slightly better thread-race wise
 2012-06-08 04:12:22 +01:00
Justin Clark-Casey (justincc)
c215b1ad16 If logging a client out due to ack timeout, do this asynchronously rather than synchronously on the outgoing packet loop. 
This is the same async behaviour as normal logouts.
This is necessary because the event queue will sleep the thread for 5 seconds on an ack timeout logout as the client isn't around to pick up the final event queue messages.
 2012-06-08 03:53:03 +01:00
Justin Clark-Casey (justincc)
5f4f9f0230 Add regression test for client logout due to ack timeout. 2012-06-08 03:12:23 +01:00
Justin Clark-Casey (justincc)
d73805d7f4 Remove null checks at top of LLUDPServer.ProcessInPacket(). Neither packet nor client are ever null. 2012-06-08 01:51:28 +01:00
Justin Clark-Casey (justincc)
d71c6dea7e Store already retrieve IClientAPI in IncomingPacket structure for later use rather than doing another retrieve on dequeue. 
Instead of checking whether the client still exists by trying to retrieve again from the client manager, this patch gets it back from IncomingPacket and checks the IClientAPI.IsActive state.
 2012-06-08 01:43:58 +01:00
Melanie
e8cd9fbbb7 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
 2012-06-07 23:33:40 +01:00
Justin Clark-Casey (justincc)
7550b97e65 Log warning if we try to remove a UDP client that has already been removed. 2012-06-07 04:00:29 +01:00
Justin Clark-Casey (justincc)
98b46d48fe Allow the thread watchdog to accept an alarm method that is invoked if the timeout is breached. 
This alarm can then invoke this to log extra information.
This is used in LLUDPServer to show which client was being processed when incoming and outgoing udp watchdog alarms are triggered.
 2012-06-07 02:44:13 +01:00
Melanie
e733fb32cf Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
 2012-06-06 13:07:05 +01:00
Talun
008c6a4610 Mantis 4597 AgentPaused packet is ignored. 
The packet was actually being handled but not acted on.
This change extends the default timeout for paused clients to 5 minutes
and makes both the paused and non-paused timeout periods configurable.
 2012-06-05 01:22:05 +01:00
Melanie
90305001de Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
 2012-04-27 17:09:49 +01:00
Justin Clark-Casey (justincc)
cb6791fb30 Tweak log messages on local region to region teleport path to help with problem resolution. 2012-04-26 22:35:25 +01:00
Justin Clark-Casey (justincc)
b0cbf16c19 minor: Add region name to dropped inbound packet message 2012-04-26 16:04:49 +01:00
Melanie
37068d17c5 Merge branch 'master' into careminster 2012-02-24 09:56:06 +00:00
Justin Clark-Casey (justincc)
f67f37074f Stop spurious scene loop startup timeout alarms for scenes with many prims. 
On the first frame, all startup scene objects are added to the physics scene.
This can cause a considerable delay, so we don't start raising the alarm on scene loop timeouts until the second frame.
This commit also slightly changes the behaviour of timeout reporting.
Previously, a report was made for the very first timed out thread, ignoring all others until the next watchdog check.
Instead, we now report every timed out thread, though we still only do this once no matter how long the timeout.
 2012-02-24 05:02:33 +00:00
Melanie
985526b662 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
	OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
 2012-02-18 22:21:10 +00:00
Justin Clark-Casey (justincc)
80ec2ac167 Correct a bug introduced in 1f402fdf (Feb 7 2012) where the delete friends grid call would try and contact the wrong uri. Also fixes the build from df960d5 2012-02-16 01:39:12 +00:00
Justin Clark-Casey (justincc)
df960d5767 Add known identity informatio nto log message if an exception is thrown during LLUDPServer.HandleUseCircuitCode() 2012-02-16 01:25:54 +00:00
Melanie
427ab55058 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneGraph.cs
 2012-01-25 00:45:57 +00:00