aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | New Teleport protocol (V2), still compatible with V1 and older. (version of ↵Diva Canto2013-07-241-0/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the destination is being checked) In this new protocol, and as committed before, the viewer is not sent EnableSimulator/EstablishChildCommunication for the destination. Instead, it is sent TeleportFinish directly. TeleportFinish, in turn, makes the viewer send a UserCircuitCode packet followed by CompleteMovementIntoRegion packet. These 2 packets tend to occur one after the other almost immediately to the point that when CMIR arrives the client is not even connected yet and that packet is ignored (there might have been some race conditions here before); then the viewer sends CMIR again within 5-8 secs. But the delay between them may be higher in busier regions, which may lead to race conditions. This commit improves the process so there are are no race conditions at the destination. CompleteMovement (triggered by the viewer) waits until Update has been sent from the origin. Update, in turn, waits until there is a *root* scene presence -- so making sure CompleteMovement has run MakeRoot. In other words, there are two threadlets at the destination, one from the viewer and one from the origin region, waiting for each other to do the right thing. That makes it safe to close the agent at the origin upon return of the Update call without having to wait for callback, because we are absolutely sure that the viewer knows it is in th new region. Note also that in the V1 protocol, the destination was getting UseCircuitCode from the viewer twice -- once on EstablishAgentCommunication and then again on TeleportFinish. The second UCC was being ignored, but it shows how we were not following the expected steps...
| * | | Merge branch 'master' into careminsterMelanie2013-07-245-120/+386
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/Physics/Manager/PhysicsActor.cs OpenSim/Region/Physics/Manager/PhysicsScene.cs
| | * | Add proper method doc and comments to m_dataPresentEvent (from d9d9959)Justin Clark-Casey (justincc)2013-07-231-2/+13
| | | |
| | * | Add clientstack.InboxPacketsCount stat. This records the number of packets ↵Justin Clark-Casey (justincc)2013-07-231-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | waiting to be processed at the second stage (after initial UDP processing) If this consistently increases then this is a problem since it means the simulator is receiving more requests than it can distribute to other parts of the code.
| | * | Add clientstack.OutgoingUDPSendsCount stat to show number of outbound UDP ↵Justin Clark-Casey (justincc)2013-07-232-3/+22
| | | | | | | | | | | | | | | | packets sent by a region per second
| | * | Record raw number of UDP receives as clientstack.IncomingUDPReceivesCountJustin Clark-Casey (justincc)2013-07-232-1/+20
| | | |
| | * | Add AverageUDPProcessTime stat to try and get a handle on how long we're ↵Justin Clark-Casey (justincc)2013-07-232-2/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | taking on the initial processing of a UDP packet. If we're not receiving packets with multiple threads (m_asyncPacketHandling) then this is critical since it will limit the number of incoming UDP requests that the region can handle and affects packet loss. If m_asyncPacketHandling then this is less critical though a long process will increase the scope for threads to race. This is an experimental stat which may be changed.
| | * | Added check for user movement specification before discarding an incomingRobert Adams2013-07-222-42/+42
| | | | | | | | | | | | | | | | | | | | | | | | AgentUpdate packet. This fixes the problem with vehicles not moving forward after the first up-arrow. Code to fix a potential exception when using different IClientAPIs.
| | * | Minor cosmetic changes.Diva Canto2013-07-211-27/+23
| | | |
| | * | The quaternion delta was a bit to high, now that the head rotation is out of ↵Diva Canto2013-07-211-1/+1
| | | | | | | | | | | | | | | | the equation. (head rotation was the problematic one)
| | * | EDIT BEAMS!!! They had been missing from OpenSim since ever. Thanks to ↵Diva Canto2013-07-211-23/+4
| | | | | | | | | | | | | | | | lkalif for telling me how to route the information. The viewer effect is under the distance filter, so only avatars with cameras < 10m away see the beams.
| | * | A couple of small optimizations over the previous commitDiva Canto2013-07-211-8/+10
| | | |
| | * | Manage AgentUpdates more sanely:Diva Canto2013-07-211-106/+108
| | | | | | | | | | | | | | | | | | | | | | | | - The existing event to scene has been split into 2: OnAgentUpdate and OnAgentCameraUpdate, to better reflect the two types of updates that the viewer sends. We can run one without the other, which is what happens when the avie is still but the user is camming around - Added thresholds (as opposed to equality) to determine whether the update is significant or not. I thin these thresholds are ok, but we can play with them later - Ignore updates of HeadRotation, which were problematic and aren't being used up stream
| | * | Fixed the stats in show client stats. Also left some comments with ↵Diva Canto2013-07-212-5/+15
| | | | | | | | | | | | | | | | observations about AgentUpdates.
| | * | furhter shorten CheckAgentUpdateSignificance(). No real perf impact.Justin Clark-Casey (justincc)2013-07-211-7/+5
| | | |
| | * | Remove some pointless code in CheckAgentUpdateSignificance()Justin Clark-Casey (justincc)2013-07-211-30/+20
| | | |
| | * | Make the check as to whether any particular inbound AgentUpdate packet is ↵Justin Clark-Casey (justincc)2013-07-212-58/+129
| | | | | | | | | | | | | | | | | | | | | | | | significant much earlier in UDP processing (i.e. before we pointlessly place such packets on internal queues, etc.) Appears to have some impact on cpu but needs testing.
| | * | Add measure of number of inbound AgentUpdates that were seen as significant ↵Justin Clark-Casey (justincc)2013-07-211-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to "show client stats" (i.e. sent on for further processing instead of being discarded) Added here since it was the most convenient place Number is in the last column, "Sig. AgentUpdates" along with percentage of all AgentUpdates Percentage largely falls over time, most cpu for processing AgentUpdates may be in UDP processing as turning this off even earlier (with "debug lludp toggle agentupdate" results in a big cpu fall Also tidies up display.
| | * | Hack in console command "debug lludp toggle agentupdate" to allow ↵Justin Clark-Casey (justincc)2013-07-211-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AgentUpdate in packets to be discarded at a very early stage. Enabling this will stop anybody from moving on a sim, though all other updates should be unaffected. Appears to make some cpu difference on very basic testing with a static standing avatar (though not all that much). Need to see the results with much higher av numbers.
| | * | minor: provide user feedback in the log for now when udp in/out bound ↵Justin Clark-Casey (justincc)2013-07-211-4/+8
| | | | | | | | | | | | | | | | threads are started/stopped
| | * | Fix up a temporary debugging change from last commit which stopped "lludp ↵Justin Clark-Casey (justincc)2013-07-211-2/+1
| | | | | | | | | | | | | | | | stop out" from actually doing anything
| | * | Do some simple queue empty checks in the main outgoing udp loop instead of ↵Justin Clark-Casey (justincc)2013-07-215-22/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | always performing these on a separate fired thread. This appears to improve cpu usage since launching a new thread is more expensive than performing a small amount of inline logic. However, needs testing at scale.
| * | | Merge branch 'master' into careminsterMelanie2013-07-247-99/+104
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
| | * | Changed the timoeut of EQ 502s (no events) to 50 secs. The viewer post ↵Diva Canto2013-07-181-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | requests timeout in 60 secs. There's plenty of room for improvement in handling the EQs. Some other time...
| | * | try Hacking in an AutoResetEvent to control the outgoing UDP loop instead of ↵Justin Clark-Casey (justincc)2013-07-182-2/+28
| | | | | | | | | | | | | | | | | | | | | | | | a continuous loop with sleeps. Does appear to have a cpu impact but may need further tweaking
| | * | Reverting the reverts I did yesterday. cpu-branch has now beenDiva Canto2013-07-181-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | successfully tested, and I'm merging back those changes, which proved to be good. Revert "Revert "Cleared up much confusion in PollServiceRequestManager. Here's the history:"" This reverts commit fa2370b32ee57a07f27501152c3c705a883b13d8.
| | * | Revert "Cleared up much confusion in PollServiceRequestManager. Here's the ↵Diva Canto2013-07-171-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | history:" This reverts commit e46459ef21e1ee5ceaeca70365a7c881d33b09ce.
| | * | Cleared up much confusion in PollServiceRequestManager. Here's the history:Diva Canto2013-07-171-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | When Melanie added the web fetch inventory throttle to core, she made the long poll requests (EQs) effectively be handled on an active loop. All those requests, if they existed, were being constantly dequeued, checked for events (which most often they didn't have), and requeued again. This was an active loop thread on a 100ms cycle! This fixes the issue. Now the inventory requests, if they aren't ready to be served, are placed directly back in the queue, but the long poll requests aren't placed there until there are events ready to be sent or timeout has been reached. This puts the LongPollServiceWatcherThread back to 1sec cycle, as it was before.
| | * | revert last commit which seems to conflict with DoubleQueue internals. The ↵dahlia2013-07-161-10/+5
| | | | | | | | | | | | | | | | random crash might be in DoubleQueue instead. See http://pastebin.com/XhNBNqsc
| | * | add locking to internal queue in WebFetchInvDescModule; lack of which caused ↵dahlia2013-07-161-5/+10
| | | | | | | | | | | | | | | | a random crash in a load test yesterday
| | * | Simplify EventQueue cap setup so that it is also stat monitored.Justin Clark-Casey (justincc)2013-07-161-45/+29
| | | | | | | | | | | | | | | | Curiously, the number of requests received is always one greater than that shown as handled - needs investigation
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-07-152-3/+4
| | |\ \
| | | * | Revert "Puts RequestImage (UDP) back to asyn -- CPU spike hunt"Diva Canto2013-07-151-1/+1
| | | | | | | | | | | | | | | | | | | | This reverts commit b060ce96d93a33298b59392210af4d336e0d171b.
| | | * | Guard against null refDiva Canto2013-07-151-1/+2
| | | | |
| | | * | Puts RequestImage (UDP) back to asyn -- CPU spike huntDiva Canto2013-07-151-1/+1
| | | | |
| | | * | Revert the revertDiva Canto2013-07-151-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Trying to hunt the CPU spikes recently experienced." This reverts commit ac73e702935dd4607c13aaec3095940fba7932ca.
| | | * | Trying to hunt the CPU spikes recently experienced.Diva Canto2013-07-151-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Comment out old inbound UDP throttling hack. This would cause the UDP" This reverts commit 38e6da5522a53c7f65eac64ae7b0af929afb1ae6.
| | * | | Add request received/handling stats for caps which are served by http poll ↵Justin Clark-Casey (justincc)2013-07-153-48/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | handlers. This adds explicit cap poll handler supporting to the Caps classes rather than relying on callers to do the complicated coding. Other refactoring was required to get logic into the right places to support this.
| * | | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2013-07-181-4/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | careminster Conflicts: OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
| | * \ \ \ Merge branch 'master' into careminsterMelanie2013-07-131-16/+28
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
| | * | | | Merge branch 'master' into careminsterMelanie2013-07-138-122/+164
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
| * | \ \ \ \ Merge branch 'master' into careminsterMelanie2013-07-189-135/+191
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | / / | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | Moved SendInitialDataToMe to earlier in CompleteMovement. Moved ↵Diva Canto2013-07-131-1/+1
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TriggerOnMakeRootAgent to the end of CompleteMovement. Justin, if you read this, there's a long story here. Some time ago you placed SendInitialDataToMe at the very beginning of client creation (in LLUDPServer). That is problematic, as we discovered relatively recently: on TPs, as soon as the client starts getting data from child agents, it starts requesting resources back *from the simulator where its root agent is*. We found this to be the problem behind meshes missing on HG TPs (because the viewer was requesting the meshes of the receiving sim from the departing grid). But this affects much more than meshes and HG TPs. It may also explain cloud avatars after a local TP: baked textures are only stored in the simulator, so if a child agent receives a UUID of a baked texture in the destination sim and requests that texture from the departing sim where the root agent is, it will fail to get that texture. Bottom line: we need to delay sending the new simulator data to the viewer until we are absolutely sure that the viewer knows that its main agent is in a new sim. Hence, moving it to CompleteMovement. Now I am trying to tune the initial rez delay that we all experience in the CC. I think that when I fixed the issue described above, I may have moved SendInitialDataToMe to much later than it should be, so now I'm moving to earlier in CompleteMovement.
| | * | | Changed UploadBakedTextureModule so that it uses the same pattern as the ↵Diva Canto2013-07-121-8/+27
| | |/ / | | | | | | | | | | | | others, in preparation for experiments to direct baked texture uploads to a robust instance. No functional or configuration changes -- should work exactly as before.
| | * | Switched UUIDNameRequest and RegionHandleRequest to Sync, because now they ↵Diva Canto2013-07-111-2/+2
| | | | | | | | | | | | | | | | are also non-blocking handlers.
| | * | Switched TransferRequest (UDP packet handler) to sync. The permissions ↵Diva Canto2013-07-111-99/+115
| | | | | | | | | | | | | | | | checks may block, so they get a FireAndForget. Everything else is non-blocking.
| | * | Switched RegionHandshakeReply to Sync, because it's not doing anything blocking.Diva Canto2013-07-101-1/+1
| | | |
| | * | EXPERIMENTAL: make RequestImage (UDP packet handler) sync instead of async. ↵Diva Canto2013-07-101-1/+1
| | | | | | | | | | | | | | | | This _shouldn't_ screw things up, given that all this does is to dump the request in a queue.
| | * | Added show client-stats [first last] command to expose what viewers are ↵Diva Canto2013-07-102-15/+30
| | | | | | | | | | | | | | | | requesting.
| | * | Comment out old inbound UDP throttling hack. This would cause the UDPRobert Adams2013-07-091-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | reception thread to sleep for 30ms if the number of available user worker threads got low. It doesn't look like any of the UDP packet types are marked async so this check is 1) unnecessary and 2) really crazy since it stops up the reception thread under heavy load without any indication.