d33964222a
Fix an issue where specifying both max client and server outgoing UDP throttles would cause client throttles to be lower than expected when total requests exceeded the scene limit.
...
This was because specifying a max client throttle would always request the max from the parent server throttle, no matter the actual total requests on the client throttle.
This would lead to a lower server multiplier than expected.
This change also adds a 'target' column to the "show throttles" output that shows the target rate (as set by client) if adaptive throttles is active.
This commit also re-adds the functionality lost in recent 5c1a1458
2014-11-25 23:21:38 +00:00
ead32de790
Use automatic properties for Parent and TotalDripRequest in TokenBucket to make code analysis easier. No functional change.
2014-11-25 23:21:37 +00:00
40314b56f2
Remove the unnecessary intermediate total token bucket.
...
This only had one child, which is the 'adaptive' token bucket.
So from testing and currently analysis, we can use that bucket directly which simplifies the code.
2014-11-25 23:21:37 +00:00
93f3444de1
minor: remove warnings from unused fields in LocalGridServicesConnector
2014-11-25 23:21:37 +00:00
dacd0ecfee
minor: Remove unused field from EntityTransferModule
2014-11-25 23:21:37 +00:00
a98b514184
minor: remove compiler warning from unused field in SimulatorFeaturesModule
2014-11-25 23:21:37 +00:00
0d77796584
minor: resolve warnings from unused fields in XBakesGet and Post handlers
2014-11-25 23:21:37 +00:00
d5ead532cb
Remove compiler warning from UserProfilesHandlers
2014-11-25 23:21:37 +00:00
07a7f941e5
minor: remove warning in BasicHttpAuthentication by commenting out unused remove_me parameter (which looks like it might still be potentially useful for logging)
2014-11-25 23:21:37 +00:00
df031fe8be
extend TestClientThrottleRegionLimited for 2 clients after testing 1. Renames to TestSingleClientThrottleRegionLimited()
2014-11-25 23:21:37 +00:00
dce98acb69
Add regression test TestClientThrottleRegionLimited() for testing simple behaviour of throttles where a region-wide total outbound limit is in place.
2014-11-25 23:21:37 +00:00
075f718f3f
factor out common throttle setting byte[] array construction in ThrottleTests.
2014-11-25 23:21:37 +00:00
9cdd38d0cf
Add regression test TestClientThrottleLimited() for throttle behaviour when a max client total limit is enforced server-side
2014-11-25 23:21:37 +00:00
fc878a33ed
refactor: consistently put all test classes in the OpenSim.Tests.Common package rather than some in OpenSim.Tests.Common.Mock
...
the separate mock package was not useful and was just another using line to always add
2014-11-25 23:21:37 +00:00
af0a851eba
minor: disable logging in regression test TestClientThrottleSetNoLimit
2014-11-25 23:18:40 +00:00
9934e2c545
minor: comment out unused method in regression BasicCircuitTests
2014-11-25 23:18:40 +00:00
746defa094
Add basic regression test ThrottleTests.TestClientThrottleSetNoLimit
2014-11-25 23:18:40 +00:00
52370ac94d
refactor: Move test clientstack setup code out of BasicCircuitTests into OpenSim.Tests.Common.ClientStackHelpers
2014-11-25 23:18:40 +00:00
87d5da86a1
Fix recent regression in "debug lludp throttles get" command that stopped it printing any information. Also fix max throttle displayed to be properly kbps
2014-11-25 23:18:40 +00:00
a13022c296
minor: in "show server throttles", display unset if new client throttle value is not set rather than 0
2014-11-25 23:18:40 +00:00
44e0a2f906
Add throttle-max option to "debug lludp throttles set" to allow runtime setting of default and existing client throttles.
...
Doesn't yet adjust until clients submit new throttle settings.
2014-11-25 23:18:40 +00:00
5c13980eb7
Change "debug lludp throttle *" commands to "debug lludp throttles" for consistency (and because I keep typing throttles).
...
This will still work with "debug lludp throttle" anyway.
2014-11-25 23:18:40 +00:00
a4209d2df4
small adjustment to commented out scene_throttle_max_bps and client_throttle_max_bps examples in OpenSimDefaults.ini
...
Make them actually reflect 20 mbit and 1.5 mbit respectively
2014-11-25 23:18:40 +00:00
c5cd93db81
Change help text for client_throttle_max_bps in OpenSimDefaults.ini to state it is in bytes, not bits
...
This is the same as already done for scene_throttle_max_bps
Internally, the token buckets are in bytes and the other help text makes it clear that the number is bytes per second
(though with the wrong assumption that 1 mbit = 1024 * 1024 bits whereas 1 mbit = 1000 kbits = 1000000 bits)
2014-11-25 23:18:40 +00:00
d20aeefef2
Fix console set and get of max scene rate. Was performing wrong calculation - throttle buckets are set in bytes, not bits
2014-11-25 23:18:40 +00:00
10d09e287c
Eliminate 'max' throttle setting from server throttles report since this never applies.
2014-11-25 23:18:40 +00:00
679eaec22f
Allow "debug lludp throttle *" commands to work without a user name, in which case they apply to all users in the lludp server
2014-11-25 23:18:39 +00:00
a142edec03
minor: add apparant total to logging when client sets throttles
2014-11-25 23:18:39 +00:00
c73e62ea3a
minor: fix bug in throttle logging where arguments were mismatched
2014-11-25 23:18:39 +00:00
1d33a40f59
Add "debug lludp set scene-throttle-max <value>" console command to allow us to potentially set the scene max throttle on the fly.
2014-11-25 23:18:39 +00:00
a5eabdade3
Move information about "server agent rate" throttles into "show server throttles" command rather than "show throttles"
...
THis allows us to see the rates when no client is connected to the region.
2014-11-25 23:18:39 +00:00
c8f5add2fc
Add "show server throttles" command for showing server specific information about throttles
...
This is separate from the user-oriented "show throttles" command since one will often only want to know about varying client throttle settings.
Currently displays max scene throttle and adaptive throttles config if set.
2014-11-25 23:18:39 +00:00
bb5e2e1f02
refactor: Use simpler auto-implemented property for HttpPort in GridRegion
2014-11-25 23:18:39 +00:00
13e2af7525
minor: Remove compiler warning from GridRegion in IGridService
2014-11-25 23:18:39 +00:00
968b588bb9
minor: remove compiler warning from OpenProfileClient
2014-11-25 23:18:39 +00:00
51eb8facd6
Add OutgoingPacketsQueuedCount clientstack stat.
...
This is the total of queued outgoing packets across all connections, as also seen in the "show queues" command.
Gives some early indication of whether the simulator can't send all outgoing packets fast enough.
Though then one would want to check that this isn't due to a few bad client connections.
2014-11-25 23:18:39 +00:00
4c5fbf8b0a
minor: Remove compiler warnings from unused fields in TokenBucket
2014-11-25 23:18:39 +00:00
12daa3c3d9
refactor: Move LLUDPServer console commands into their own class.
2014-11-25 23:18:39 +00:00
f0fd2fa325
refactor: rename "debug lludp throttle status" to "debug lludp throttle get" to match set command
2014-11-25 23:18:38 +00:00
e144958e03
Add "debug lludp throttle set" command to allow setting of parameters at runtime
...
Can currently only set adaptive true|false, where adaptive = false
2014-11-25 23:18:38 +00:00
b9b483151f
Eliminate a few unnecessary calculations in the maintenance loop.
...
Also uses wait event instead of sleep for periodicity control.
2014-11-25 23:18:38 +00:00
7d30bb13be
Fix recent minor regression where the default frame time wasn't being set if there was no startup config section.
...
Caused some regression tests to fail.
2014-11-25 23:18:38 +00:00
8d72145112
If Bullet is running on its own thread, use a reset event to control timing rather than a sleep.
...
In theory, there should be no difference between these mechanisms.
However, on at least Mono 3.2.8 waiting via an event appears to be much more accurate.
2014-11-25 23:18:38 +00:00
7bababaab6
Improve frame time stability by taking a few unnecessary repeated calculations out of the main scene loop.
...
Also uses a wait event to sleep rather than a Thread.Sleep to allow the loop to be interrupted in a more controlled manner when necessary.
2014-11-25 23:18:38 +00:00
23561239ee
Make BulletSim thread be ThreadPriority.Highest if running
...
Will only effect Windows or mono with a patch such as https://gist.github.com/justincc/31e52218d098529b4696 applied
For test purposes
2014-11-25 23:18:38 +00:00
cfc4055991
Make outboudn and packet inbox handling threads highest priority.
...
Will only have any affect under Windows or mono with a patch such as https://gist.github.com/justincc/31e52218d098529b4696 (not recommended) applied.
For assessment purposes.
2014-11-25 23:18:38 +00:00
5b6fb7245a
Set ThreadPriority on main scene thread to highest.
...
This will only have an effect on Windows systems or mono with the (not recommended) mono-3.2.8 debug patch https://gist.github.com/justincc/31e52218d098529b4696 applied
2014-11-25 23:18:38 +00:00
d3ed5de77d
Add loglevel to jobengine that can be controlled via "debug jobengine loglevel <level>".
...
Defaults to 0
Level 1 currently does verbose logging about every queued and processed job.
2014-11-25 23:18:38 +00:00
9fb3065d33
Temporarily add root agent rez attachments work to job engine if it is running rather than as a fire and forget.
...
Experiment to see if serializing attachment rez and send initial data jobs improves other parts of sim performance.
2014-11-25 23:18:38 +00:00
859b1c5ba4
Add experimental job engine to see if queueing some existing async work during root agent entry to a region improves perf rather than always attempting to execute everything concurrently
...
Job engine is controlled via "debug jobengine start|stop|status".
Can only currently be enabled and disabled dynamically at runtime.
Currently only applies to code sending initial region data (objects, other avatar data) to a client.
2014-11-25 23:18:37 +00:00
Justin Clark-Casey (justincc)