aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'queuetest' into careminster-presence-refactorMelanie2011-04-2511-226/+409
|\
| * Merge branch 'master' into queuetestMic Bowman2011-04-252-11/+32
| |\
| * | Fixed the transmission of throttles from root agent to childMic Bowman2011-04-253-34/+41
| | | | | | | | | | | | | | | | | | agents. Child throttles are based on the number of child agents known to the root and at least 1/4 of the throttle given to the root.
| * | Merge branch 'master' into queuetestMic Bowman2011-04-251-6/+4
| |\ \
| * | | Cleaned up various configuration options. Removed the category throttleMic Bowman2011-04-255-110/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | limits because the only ones used now are the defaults (which are overwritten by the client throttles anyway). Updated the default rates to correspond to about 350kbps. Also added a configuration to disable adaptive throttle. The default is the previous behavior (no adaptation).
| * | | Merge branch 'master' into queuetestMic Bowman2011-04-2525-72/+140
| |\ \ \
| * | | | Fix a bug looping through the priority queues. This should fix the problemMic Bowman2011-04-231-2/+3
| | | | | | | | | | | | | | | | | | | | of not all prims being sent without reprioritization.
| * | | | Added a second immediate queue to be used for the BestAvatar policyMic Bowman2011-04-222-21/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and currently used for all of an avatars attachments by the other policies. Also changed the way items are pulled from the update queues to bias close objects even more.
| * | | | Set the initial rate for the adaptive throttle to 160KpbsMic Bowman2011-04-221-4/+6
| | | | | | | | | | | | | | | | | | | | or about 15 packets per second.
| * | | | Various clean ups. Removed some debugging code. Added a new "show pqueues"Mic Bowman2011-04-224-29/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | command to look at the entity update priority queue. Added a "name" parameter to show queues, show pqueues and show throttles to look at data for a specific user.
| * | | | Merge branch 'queuetest' of ssh://opensimulator.org/var/git/opensim into ↵Mic Bowman2011-04-212-26/+34
| |\ \ \ \ | | | | | | | | | | | | | | | | | | queuetest
| | * | | | Refactor UnackedPacketCollection so ProcessQueues will handle Adds, Acks, ↵Dan Lake2011-04-212-26/+34
| | | | | | | | | | | | | | | | | | | | | | | | and Removes in that order.
| * | | | | Add some locking on the child list for the token bucketMic Bowman2011-04-211-15/+22
| |/ / / / | | | | | | | | | | | | | | | hiearchy. A few other cosmetic changes.
| * | | | Merge branch 'master' into queuetestMic Bowman2011-04-2110-89/+204
| |\ \ \ \
| * | | | | Added ability to remove unacked packet from UnackedPacketCollection without ↵Dan Lake2011-04-212-2/+38
| | | | | | | | | | | | | | | | | | | | | | | | an acknowledgement from the network. This prevents RTT and throttles from being updated as they would when an ACK is actually received. Also fixed stats logging for unacked bytes and resent packets in this case.
* | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-2516-33/+61
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Made things consistent between LocalInventoryServiceConnector and ↵Diva Canto2011-04-252-11/+32
| | |_|_|/ | |/| | | | | | | | | | | | | RemoteXInventoryServiceConnector on GetFolderContent.
| * | | | Addresses mantis #5449 -- crashing exception in SendInventoryFolderDetails.Diva Canto2011-04-251-6/+4
| | |_|/ | |/| |
| * | | Removed unused libraries: RAILS.dll and dependencies.Diva Canto2011-04-244-10/+0
| | | |
| * | | Removed unused libraries Castle.*Diva Canto2011-04-243-0/+0
| | | |
| * | | Upped VERSION_NUMBER in master to 0.7.2.Diva Canto2011-04-241-1/+1
| | | |
| * | | Commented verbose debug message.Diva Canto2011-04-241-1/+1
| | | |
| * | | Added MaxAgents configuration option to RegionConfig.ini allowing region ↵E. Allen Soard2011-04-233-1/+22
| | | | | | | | | | | | | | | | hosters to setup regions maintaining more control over system resources.
| * | | print invalid command message to the console, not the logJustin Clark-Casey (justincc)2011-04-231-3/+1
| | | |
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-223-3/+3
|\ \ \ \ | |/ / /
| * | | Merge branch 'master' of /home/opensim/var/repo/opensimBlueWall2011-04-212-0/+25
| |\ \ \
| * \ \ \ fix merge conflicts with OpenSimDefaults.iniBlueWall2011-04-2112-125/+273
| |\ \ \ \
| * | | | | some mesh config astheticsBlueWall2011-04-213-3/+3
| | | | | |
* | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-218-53/+87
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2011-04-218-53/+87
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2011-04-2113-126/+274
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Remove duplicated freeswitch settings.Justin Clark-Casey (justincc)2011-04-211-4/+0
| | | | | |
| | | * | | Adjust freeswitch logging to be somewhat less noisy. However, there is ↵Justin Clark-Casey (justincc)2011-04-212-14/+21
| | | | | | | | | | | | | | | | | | | | | | | | still quite a large amount of logging present for debug purposes.
| | | * | | minor: small amount of method doc and some commented out odds and endsJustin Clark-Casey (justincc)2011-04-211-6/+15
| | | | | |
| | | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-04-211-3/+10
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | * | | Alter uuid gather so that it properly analyzes coalesced objects.Justin Clark-Casey (justincc)2011-04-212-22/+43
| | | | | | | | | | | | | | | | | | | | | | | | This should correct save all the assets required for the items within the coalesced objects in an IAR. This should also correctly gather the items on hypergrid takes.
| | * | | | Group collada meshies settings under [Mesh] in OpensimDefaults.iniBlueWall2011-04-212-7/+8
| | | | | |
| * | | | | Implement agent limitsMelanie2011-04-212-0/+25
| | |_|/ / | |/| | |
* | | | | Add fix a minor bugMelanie2011-04-211-1/+1
| | | | |
* | | | | Honor agent limit for region crossings and teleportsMelanie2011-04-212-10/+25
| | | | |
* | | | | Merge branch 'queuetest' into careminster-presence-refactorMelanie2011-04-2110-103/+337
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | bug fix. Now when an unacked update packet is handled through ↵Dan Lake2011-04-203-16/+25
| | | | | | | | | | | | | | | | | | | | ResendPrimUpdates, it is removed from the UnackedPacketCollection.
| * | | | Added an "immediate" queue to the priority queue. This isMic Bowman2011-04-202-17/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | per Melanie's very good suggestion. The immediate queue is serviced completely before all others, making it a very good place to put avatar updates & attachments. Moved the priority queue out of the LLUDP directory and into the framework. It is now a fairly general utility.
| * | | | Merge branch 'queuetest' of ssh://opensimulator.org/var/git/opensim into ↵Mic Bowman2011-04-200-0/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | queuetest Conflicts: OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
| | * | | | Requeue unacknowledged entity updates rather than resend then "as is".Dan Lake2011-04-185-66/+176
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Often, by the time the UDPServer realizes that an entity update packet has not been acknowledged, there is a newer update for the same entity already queued up or there is a higher priority update that should be sent first. This patch eliminates 1:1 packet resends for unacked entity update packets. Insteawd, unacked update packets are decomposed into the original entity updates and those updates are placed back into the priority queues based on their new priority but the original update timestamp. This will generally place them at the head of the line to be put back on the wire as a new outgoing packet but prevents the resend queue from filling up with multiple stale updates for the same entity. This new approach takes advantage of the UDP nature of the Linden protocol in that the intent of a reliable update packet is that if it goes unacknowledge, SOMETHING has to happen to get the update to the client. We are simply making sure that we are resending current object state rather than stale object state. Additionally, this patch includes a generalized callback mechanism so that any caller can specify their own method to call when a packet expires without being acknowledged. We use this mechanism to requeue update packets and otherwise use the UDPServer default method of just putting expired packets in the resend queue.
| * | | | | Adds the first pass at an adaptive throttle to slow start newMic Bowman2011-04-204-18/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clients. If the sent packets are ack'ed successfully the throttle will open quickly up to the maximum specified by the client and/or the sims client throttle. This still needs a lot of adjustment to get the rates correct.
| * | | | | Converted the property request queue to use the same retransmissionMic Bowman2011-04-191-23/+52
| | | | | | | | | | | | | | | | | | | | | | | | mechanism as the entity update queues.
| * | | | | Requeue unacknowledged entity updates rather than resend then "as is".Dan Lake2011-04-195-66/+176
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Often, by the time the UDPServer realizes that an entity update packet has not been acknowledged, there is a newer update for the same entity already queued up or there is a higher priority update that should be sent first. This patch eliminates 1:1 packet resends for unacked entity update packets. Insteawd, unacked update packets are decomposed into the original entity updates and those updates are placed back into the priority queues based on their new priority but the original update timestamp. This will generally place them at the head of the line to be put back on the wire as a new outgoing packet but prevents the resend queue from filling up with multiple stale updates for the same entity. This new approach takes advantage of the UDP nature of the Linden protocol in that the intent of a reliable update packet is that if it goes unacknowledge, SOMETHING has to happen to get the update to the client. We are simply making sure that we are resending current object state rather than stale object state. Additionally, this patch includes a generalized callback mechanism so that any caller can specify their own method to call when a packet expires without being acknowledged. We use this mechanism to requeue update packets and otherwise use the UDPServer default method of just putting expired packets in the resend queue.
* | | | | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-2121-393/+588
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | fix meshing failure on sculpt maps smaller than 64x64dahlia2011-04-191-3/+10
| | |_|/ | |/| |