aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | Merge branch 'master' into careminsterMelanie2013-07-242-3/+25
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | Correct issue where the last instance of a sampled stat was shown 3x larger ↵Justin Clark-Casey (justincc)2013-07-231-1/+2
| | | | | | | | | | | | | | | | | | | | than it should have been (though internal use was correct)
| | * | | Improve spacing between data and units on console stats displayJustin Clark-Casey (justincc)2013-07-231-3/+12
| | | | |
| | * | | For stats which can show average change over time, show the last sample as ↵Justin Clark-Casey (justincc)2013-07-231-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | well as the average. This is somewhat cryptic at the moment, need to improve documentation.
| | * | | EDIT BEAMS!!! They had been missing from OpenSim since ever. Thanks to ↵Diva Canto2013-07-211-1/+1
| | | | | | | | | | | | | | | | | | | | 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.
| | * | | Manage AgentUpdates more sanely:Diva Canto2013-07-211-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
| | * | | Removed verbose debug from previous commitDiva Canto2013-07-211-1/+0
| | | | |
| | * | | PollServiceRequestManager: changed the long poll from a Queue to a List. No ↵Diva Canto2013-07-211-13/+17
| | | | | | | | | | | | | | | | | | | | need to dequeue and enqueue items every 1sec.
| | * | | Delay the enqueueing of non-longpoll requests for 100ms. No need to have ↵Diva Canto2013-07-211-1/+11
| | | | | | | | | | | | | | | | | | | | these requests actively on the processing queue if it seems they're not ready.
| * | | | Merge branch 'master' into careminsterMelanie2013-07-247-17/+102
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | 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-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | requests timeout in 60 secs. There's plenty of room for improvement in handling the EQs. Some other time...
| | * | | Revert "Revert "I confuse myself. Let's try this variable name instead.""Diva Canto2013-07-181-3/+3
| | | | | | | | | | | | | | | | | | | | This reverts commit 52dc7b2a96a28798d55d07d79d003ce5e3d35216.
| | * | | Revert "Revert "Do the same trick that dahlia did for Dequeue(timeout)""Diva Canto2013-07-181-2/+3
| | | | | | | | | | | | | | | | | | | | This reverts commit 5495df74436d6c0039a1500d979a964b003abfdf.
| | * | | Revert "Revert "Putting the requests back in the queue while testing for ↵Diva Canto2013-07-181-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | count >0 is not the smartest move..."" This reverts commit 71278919575b0e0222cdbe3c0cefa5919f9a75bc.
| | * | | Revert "Revert "Didn't mean to commit this change in BlockingQueue.cs""Diva Canto2013-07-181-1/+1
| | | | | | | | | | | | | | | | | | | | This reverts commit fda91d93dad1fa6f901e8db5829aa8b70477c97e.
| | * | | Reverting the reverts I did yesterday. cpu-branch has now beenDiva Canto2013-07-183-49/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | | Merge branch 'master' of git://opensimulator.org/git/opensimDan Lake2013-07-181-1/+1
| | |\ \ \
| | | * | | Fix what apepars to be a bug in DoubleQueue<T>.Enqueue(Queue<T> q, T data) ↵Justin Clark-Casey (justincc)2013-07-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | where the q parmater is ignored and everyghig is always placed on m_lowQueue. No actual impact presently since nothing ends up calling EnqueueHigh()
| | * | | | Added MinPoolThreads to ini [Startup] section to control SmartThreadPool.Dan Lake2013-07-181-3/+5
| | |/ / /
| | * | | Revert "Cleared up much confusion in PollServiceRequestManager. Here's the ↵Diva Canto2013-07-173-36/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | history:" This reverts commit e46459ef21e1ee5ceaeca70365a7c881d33b09ce.
| | * | | Revert "Didn't mean to commit this change in BlockingQueue.cs"Diva Canto2013-07-171-1/+1
| | | | | | | | | | | | | | | | | | | | This reverts commit 0f5b616fb0ebf9207b3cc81771622ed1290ea7d6.
| | * | | Revert "Putting the requests back in the queue while testing for count >0 is ↵Diva Canto2013-07-171-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not the smartest move..." This reverts commit f4317dc26d670c853d0ea64b401b00f718f09474.
| | * | | Revert "Do the same trick that dahlia did for Dequeue(timeout)"Diva Canto2013-07-171-3/+2
| | | | | | | | | | | | | | | | | | | | This reverts commit af792bc7f2504e9ccf1c8ae7568919785dc397c9.
| | * | | Revert "I confuse myself. Let's try this variable name instead."Diva Canto2013-07-171-3/+3
| | | | | | | | | | | | | | | | | | | | This reverts commit 1d3deda10cf85abd68a5f904d6698ae597a67cc0.
| | * | | Revert "Now trying DoubleQueue instead of BlockingQueue for the ↵Diva Canto2013-07-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PollServiceRequestManager." This reverts commit 5f95f4d78e8c7d17b8ba866907156fe6d4444c04.
| | * | | Revert "This is a completely unreasonable thing to do, effectively defying ↵Diva Canto2013-07-171-52/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the purpose of BlockingQueues. Trying this, to see the effect on CPU." This reverts commit 5232ab0496eb4fe6903a0fd328974ac69df29ad8.
| | * | | This is a completely unreasonable thing to do, effectively defying the ↵Diva Canto2013-07-171-40/+52
| | | | | | | | | | | | | | | | | | | | purpose of BlockingQueues. Trying this, to see the effect on CPU.
| | * | | Now trying DoubleQueue instead of BlockingQueue for the ↵Diva Canto2013-07-171-2/+2
| | | | | | | | | | | | | | | | | | | | PollServiceRequestManager.
| | * | | I confuse myself. Let's try this variable name instead.Diva Canto2013-07-171-3/+3
| | | | |
| | * | | Do the same trick that dahlia did for Dequeue(timeout)Diva Canto2013-07-171-2/+3
| | | | |
| | * | | Putting the requests back in the queue while testing for count >0 is not the ↵Diva Canto2013-07-171-3/+7
| | | | | | | | | | | | | | | | | | | | smartest move...
| | * | | Didn't mean to commit this change in BlockingQueue.csDiva Canto2013-07-171-1/+1
| | | | |
| | * | | Cleared up much confusion in PollServiceRequestManager. Here's the history:Diva Canto2013-07-173-49/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | | minor: Add warning method doc about possibly inconsistent results returned ↵Justin Clark-Casey (justincc)2013-07-161-1/+19
| | | | | | | | | | | | | | | | | | | | from BlockingQueue.Contains(), Count() and GetQueueArray()
| | * | | Revert "Revert "MSDN documentation is unclear about whether exiting a lock() ↵Justin Clark-Casey (justincc)2013-07-161-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | block will trigger a Monitor.Wait() to exit, so avoid some locks that don't actually affect the state of the internal queues in the BlockingQueue class."" This reverts commit 21a09ad3ad42b24bce4fc04c6bcd6f7d9a80af08. After more analysis and discussion, it is apparant that the Count(), Contains() and GetQueueArray() cannot be made thread-safe anyway without external locking And this change appears to have a positive impact on performance. I still believe that Monitor.Exit() will not release any thread for Monitor.Wait(), as per http://msdn.microsoft.com/en-gb/library/vstudio/system.threading.monitor.exit%28v=vs.100%29.aspx so this should in theory make no difference, though mono implementation issues could possibly be coming into play.
| | * | | Revert "MSDN documentation is unclear about whether exiting a lock() block ↵Justin Clark-Casey (justincc)2013-07-161-8/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | will trigger a Monitor.Wait() to exit, so avoid some locks that don't actually affect the state of the internal queues in the BlockingQueue class." This reverts commit 42e2a0d66eaa7e322bce817e9e2cc9a288de167b Reverting because unfortunately this introduces race conditions because Contains(), Count() and GetQueueArray() may now end up returning the wrong result if another thread performs a simultaneous update on m_queue. Code such as PollServiceRequestManager.Stop() relies on the count being correct otherwise a request may be lost. Also, though some of the internal queue methods do not affect state, they are not thread-safe and could return the wrong result generating the same problem lock() generates Monitor.Enter() and Monitor.Exit() under the covers. Monitor.Exit() does not cause Monitor.Wait() to exist, only Pulse() and PulseAll() will do this Reverted with agreement.
| | * | | MSDN documentation is unclear about whether exiting a lock() block will ↵dahlia2013-07-161-5/+8
| | | | | | | | | | | | | | | | | | | | trigger a Monitor.Wait() to exit, so avoid some locks that don't actually affect the state of the internal queues in the BlockingQueue class.
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-07-153-3/+4
| | |\ \ \
| | | * | | This might address the following observed exception:Diva Canto2013-07-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 17:14:28 - [APPLICATION]: APPLICATION EXCEPTION DETECTED: System.UnhandledExceptionEventArgs Exception: System.InvalidOperationException: Operation is not valid due to the current state of the object at System.Collections.Generic.Queue`1[OpenSim.Region.ClientStack.Linden.WebFetchInvDescModule+aPollRequest].Peek () [0x00011] in /root/install/mono-3.1.0/mono/mcs/class/System/System.Collections.Generic/Queue.cs:158 at System.Collections.Generic.Queue`1[OpenSim.Region.ClientStack.Linden.WebFetchInvDescModule+aPollRequest].Dequeue () [0x00000] in /root/install/mono-3.1.0/mono/mcs/class/System/System.Collections.Generic/Queue.cs:140 at OpenSim.Framework.DoubleQueue`1[OpenSim.Region.ClientStack.Linden.WebFetchInvDescModule+aPollRequest].Dequeue (TimeSpan wait, OpenSim.Region.ClientStack.Linden.aPollRequest& res) [0x0004e] in /home/avacon/opensim_2013-07-14/OpenSim/Framework/Util.cs:2297
| | * | | | Add request received/handling stats for caps which are served by http poll ↵Justin Clark-Casey (justincc)2013-07-155-51/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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' into careminsterMelanie2013-07-1817-27/+217
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | Authenticate ChildAgentUpdate too.Diva Canto2013-07-142-2/+3
| | |/ / /
| | * | | Add ToOSDMap() overrides to the Stat subclass CounterStat.Robert Adams2013-07-123-0/+88
| | | | | | | | | | | | | | | | | | | | | | | | | Add a GetStatsAsOSDMap method to StatsManager which allows the filtered fetching of stats for eventual returning over the internets.
| | * | | Fix regression where llHTTPRequests which did not get an OK response ↵Justin Clark-Casey (justincc)2013-07-111-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | returned 499 and the exception message in the http_response event rather than the actual response code and body. This was a regression since commit 831e4c3 (Thu Apr 4 00:36:15 2013) This commit also adds a regression test for this case, though this currently only works with Mono This aims to address http://opensimulator.org/mantis/view.php?id=6704
| | * | | Added show client-stats [first last] command to expose what viewers are ↵Diva Canto2013-07-101-3/+8
| | | | | | | | | | | | | | | | | | | | requesting.
| | * | | Add missing file BaseOutputStreamHandler.cs from recent commit e19defdJustin Clark-Casey (justincc)2013-07-081-0/+60
| | | | |
| | * | | minor: remove now unused migration-hack bool from DAMapJustin Clark-Casey (justincc)2013-07-081-4/+0
| | | | |
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-07-081-1/+1
| | |\ \ \
| | | * | | BaseHttpServer: if the handler sets the content length, don't override it. ↵Diva Canto2013-07-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This happens in HEAD handlers.
| | * | | | Add "show caps stats by user" and "show caps stats by cap" console commands ↵Justin Clark-Casey (justincc)2013-07-087-16/+51
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to print various counts of capability invocation by user and by cap This currently prints caps requests received and handled, so that overload of received compared to handled or deadlock can be detected. This involves making BaseStreamHandler and BaseOutputStream record the ints, which means inheritors should subclass ProcessRequest() instead of Handle() However, existing inheriting classes overriding Handle() will still work, albeit without stats recording. "show caps" becomes "show caps list" to disambiguate between show caps commands
generated by cgit v1.1 at 2024-10-21 01:43:18 +0000