00e31de872
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-10-10 23:36:50 +01:00
458540400a
Use automatic properties for Parent and TotalDripRequest in TokenBucket to make code analysis easier. No functional change.
2014-10-10 18:38:54 +01:00
5c1a14587d
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-10-10 00:58:16 +01:00
b28b31b3ee
minor: remove warnings from unused fields in LocalGridServicesConnector
2014-10-09 01:30:24 +01:00
16eb9253b0
minor: Remove unused field from EntityTransferModule
2014-10-09 01:25:11 +01:00
ba0707ca1e
minor: remove compiler warning from unused field in SimulatorFeaturesModule
2014-10-09 01:23:53 +01:00
3e4550adf7
minor: resolve warnings from unused fields in XBakesGet and Post handlers
2014-10-09 01:08:21 +01:00
e902824da7
Remove compiler warning from UserProfilesHandlers
2014-10-09 01:03:45 +01:00
235eb92c0e
minor: remove warning in BasicHttpAuthentication by commenting out unused remove_me parameter (which looks like it might still be potentially useful for logging)
2014-10-09 00:57:10 +01:00
d69ab1e037
extend TestClientThrottleRegionLimited for 2 clients after testing 1. Renames to TestSingleClientThrottleRegionLimited()
2014-10-09 00:51:36 +01:00
d69e3760e1
Add regression test TestClientThrottleRegionLimited() for testing simple behaviour of throttles where a region-wide total outbound limit is in place.
2014-10-08 23:54:11 +01:00
a83f5f2153
factor out common throttle setting byte[] array construction in ThrottleTests.
2014-10-08 22:50:34 +01:00
3802f2da3b
Add regression test TestClientThrottleLimited() for throttle behaviour when a max client total limit is enforced server-side
2014-10-08 21:30:52 +01:00
51043746f3
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-10-08 21:09:25 +01:00
b6eaef79dd
minor: disable logging in regression test TestClientThrottleSetNoLimit
2014-10-08 20:54:09 +01:00
c993067204
minor: comment out unused method in regression BasicCircuitTests
2014-10-08 20:53:39 +01:00
ef39fcf465
Add basic regression test ThrottleTests.TestClientThrottleSetNoLimit
2014-10-08 20:52:17 +01:00
e8337d6a51
refactor: Move test clientstack setup code out of BasicCircuitTests into OpenSim.Tests.Common.ClientStackHelpers
2014-10-08 20:17:51 +01:00
90b31a2f54
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-10-08 00:46:24 +01:00
b40220885e
minor: in "show server throttles", display unset if new client throttle value is not set rather than 0
2014-10-08 00:31:35 +01:00
649891a0d8
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-10-07 18:34:08 +01:00
a529bc8f2a
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-10-07 01:44:36 +01:00
16aca6ddbd
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-10-07 01:14:13 +01:00
38458d4be8
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-10-07 01:10:57 +01:00
9ee171f441
Fix console set and get of max scene rate. Was performing wrong calculation - throttle buckets are set in bytes, not bits
2014-10-07 01:08:22 +01:00
7ca4e2cb6f
Eliminate 'max' throttle setting from server throttles report since this never applies.
2014-10-07 00:08:44 +01:00
523f0b8938
Allow "debug lludp throttle *" commands to work without a user name, in which case they apply to all users in the lludp server
2014-10-07 00:03:05 +01:00
4f04c0b560
minor: add apparant total to logging when client sets throttles
2014-10-06 23:39:52 +01:00
b7f78bf0f7
minor: fix bug in throttle logging where arguments were mismatched
2014-10-06 23:34:27 +01:00
5cb3b87b21
Add "debug lludp set scene-throttle-max <value>" console command to allow us to potentially set the scene max throttle on the fly.
2014-10-06 23:29:41 +01:00
97e25a0f45
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-10-06 22:18:54 +01:00
026df644b5
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-10-06 20:34:17 +01:00
c3b1c72c33
refactor: Use simpler auto-implemented property for HttpPort in GridRegion
2014-10-03 01:22:25 +01:00
277dbb9acd
minor: Remove compiler warning from GridRegion in IGridService
2014-10-03 00:43:04 +01:00
6cfebd66ec
minor: remove compiler warning from OpenProfileClient
2014-10-03 00:38:48 +01:00
c9d7eb30db
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-10-02 23:49:37 +01:00
db5de62394
minor: Remove compiler warnings from unused fields in TokenBucket
2014-10-02 23:20:39 +01:00
5c3f33bb48
refactor: Move LLUDPServer console commands into their own class.
2014-10-02 23:18:21 +01:00
d50f85dff6
minor: Comment out received seed caps request logging for now
2014-10-02 22:37:45 +01:00
b7abcd28e1
Fix key name in example Regions.ini file
2014-10-02 22:37:34 +01:00
d53703362e
When a prim is bought through BuySellModule, the click action is not changed back from buy object. This means that after the object is bought, it still appears as if for sale which can be confusing. This sets it back to touch, the default after sale.
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2014-10-02 22:37:25 +01:00
4e1f2ba1f4
Make "generate map" console command also trigger upload to maptiles as well as asset generation without performing tile generation twice.
2014-10-02 22:37:11 +01:00
51951682e7
Fixed a hard-to-run-into bug in groups: at the time of creation of a group, the OwnerRoleID in the groups table was inconsistent with the roleID in the roles table. OpenSim core was not running into this bug, but 3rd party modules (like Wifi) were.
2014-10-02 22:36:23 +01:00
c5c387e838
refactor: rename "debug lludp throttle status" to "debug lludp throttle get" to match set command
2014-09-30 18:43:02 +01:00
f7fef5bc3b
Add "debug lludp throttle set" command to allow setting of parameters at runtime
...
Can currently only set adaptive true|false, where adaptive = false
2014-09-30 18:41:04 +01:00
8e5a62c8e7
Add "debug lludp throttle status" command to return status information about a client's throttle (currently just whether adaptive is enabled).
2014-09-30 18:18:34 +01:00
ad15e06611
Add "debug lludp throttle log <level> <avatar-first-name> <avatar-last-name>" to control extra throttle related debug logging.
2014-09-30 18:12:51 +01:00
319c51b8a8
Don't unnecessarily remove from backup objects that were not directly attached from the scene.
...
These are never in region backup in the first place since recent 11830c43
2014-09-29 23:18:18 +01:00
11830c4363
Do not add attachments to the region scene object backup list.
...
Attachment persistence is not handled in this way and this just results in a load of busy work until a check in each SOG terminates a backup check for attachments anyway.
2014-09-27 01:02:27 +01:00
2eece5b009
Move expired objects cleaning trigger to the maintenance thread of a region rather than it's main scene loop.
...
[Startup] default setting UpdateTempCleaningEveryNFrames becomes UpdateTempCleaningEveryNSeconds.
Default becomes 180s instead of effective 182s (which would also vary with any changes in frame time or extra long frames)
2014-09-27 00:30:42 +01:00
Justin Clark-Casey (justincc)