aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | minor: move "threads abort" and "force gc" console commands into debug ↵Justin Clark-Casey (justincc)2013-08-051-2/+2
| | | | | | | | | | | | | | | | | | | | category - these are not things one needs to do in normal operation
| | * | | Make it possible to set worker/iocp min/max threadpool limits on the fly ↵Justin Clark-Casey (justincc)2013-08-051-0/+78
| | | | | | | | | | | | | | | | | | | | with the console command "debug threadpool set"
| | * | | Add checks monitoring framework to provide alerts if certain conditions do ↵Justin Clark-Casey (justincc)2013-08-055-3/+385
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not hold. Not yet in use.
| | * | | Issue: 10 simultaneous TPs, many not making it. Now bypassing the per-url ↵Diva Canto2013-08-021-3/+3
| | | | | | | | | | | | | | | | | | | | lock -- we should be "ok" (or, more "ok") now that we have increased the connection limit on the http library. But this is a sensitive part of the code, so it may need reverting.
| * | | | Merge branch 'master' into careminsterMelanie2013-08-012-15/+15
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
| | * | | * Thanks Plugh for pointing out that the constructor that takes a ulong ↵teravus2013-08-012-15/+15
| | | | | | | | | | | | | | | | | | | | regionhandle and saves it to to X,Y vars in the OpenSim.Framework.Location object was inverting the X and Y resulting in X and Y confusion. The test also used 256x256 in the uint,uint constructor so it was unable to determine if the X and Y components swapped. I don't expect much upheaval from this commit, not a lot of features were using the ulong Location object constructor. The database never stores the ulong regionhandle... the prims are loaded by region Guid. LLUDPServer used it to determine regions that it handled in a service definition where there was simply a X == X test which has the same logical result un-switched as it did switched. Again, thanks LibOMV for the regionhandle code.
| * | | | Merge branch 'master' into careminsterMelanie2013-08-012-22/+68
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
| | * | | Make "abnormal thread terminations" into "ClientLogoutsDueToNoReceives" and ↵Justin Clark-Casey (justincc)2013-07-292-22/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add this to the StatsManager This reflects the actual use of this stat - it hasn't recorded general exceptions for some time. Make the sim extra stats collector draw the data from the stats manager rather than maintaing this data itself.
| * | | | Merge branch 'master' into careminsterMelanie2013-07-292-0/+23
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/Framework/Scenes/Scene.cs
| | * | | Several major improvements to group (V2) chat. Specifically: handle ↵Diva Canto2013-07-271-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | join/drop appropriately, invitechatboxes. The major departure from flotsam is to send only one message per destination region, as opposed to one message per group member. This reduces messaging considerably in large groups that have clusters of members in certain regions.
| | * | | Increased the rate of the PollServiceRequestManager to 0.5 secs (it was ↵Diva Canto2013-07-261-1/+1
| | | | | | | | | | | | | | | | | | | | 1sec). Group chat is going over the EQ... Hopefully this won't increase CPU when there's nothing going on, but we need to watch for that.
| | * | | Fix regression tests relating to agent transfer by making simulator use last ↵Justin Clark-Casey (justincc)2013-07-261-0/+5
| | | | | | | | | | | | | | | | | | | | week's SIMULATOR/0.1 protocol for now.
| * | | | Merge branch 'master' into careminsterMelanie2013-07-251-5/+6
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs bin/OpenSimDefaults.ini
| | * | | New Teleport protocol (V2), still compatible with V1 and older. (version of ↵Diva Canto2013-07-241-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-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.
generated by cgit v1.1 at 2024-12-22 11:54:03 +0000