Commit Graph

21509 Commits (eaa048eb8917ddbfa393bfa355c7c4045645a2b7)

Author SHA1 Message Date
Justin Clark-Casey (justincc) eaa048eb89 Change the word order of some debug lludp settings for readability
On server, scene-throttle-max becomes max-scene-throttle and likewise max-new-client-throttle
On clients, throttle-max becomes max
2014-10-21 02:17:38 +01:00
Justin Clark-Casey (justincc) bb3e68c069 Add "debug lludp get/set new-client-throttle-max" to allow default new client throttle to be set separately from existing clients.
"debug lludp throttles get/set throttle-max" now only gets and sets current max client throttles
2014-10-21 02:10:55 +01:00
Justin Clark-Casey (justincc) 5dc0730f06 Add "debug lludp get" command which currently just shows scene-throttle-max to mirror "debug lludp set"
Information is also available in "show server throttles" but that's more for non-debug info rather than attempting to get and set parameters on the fly for debug purposes.
2014-10-21 01:48:59 +01:00
Justin Clark-Casey (justincc) 3e25e6a170 Add some more llGiveInventory() regression tests 2014-10-20 23:57:16 +01:00
Melanie Thielker c6f39a0bfd Fix transferring inventory from prims to agent inventory 2014-10-20 23:50:17 +01:00
Justin Clark-Casey (justincc) 830735a42f When inserting missing CreatorData in the HGAssetMapper, do the rewrite on a streaming xml basis rather than loading it all into memory via XmlDocument.
This is because objects with lots of parts can have a lot of xml to load into memory, and this has been seen to have a noticeable performance impact.
Whereas streaming has been seen to reduce the impact in normal serialization.
Implmentation is messy but I couldn't see a better way of doing it when you can't assume that you know the exact structure of the input XML.
2014-10-20 23:46:34 +01:00
Justin Clark-Casey (justincc) dede17b0d2 Add regression test TestPostAssetRewrite() to check results of HGAssetMapper.Post() object asset rewriting, 2014-10-16 01:13:38 +01:00
Justin Clark-Casey (justincc) a54c784b81 If an exception makes it to the top of a JobEngine request, catch and log instead of letting it terminate the simulator... 2014-10-14 20:42:41 +01:00
Justin Clark-Casey (justincc) 493a86dfed Allow GetMesh capability to be served directly by a server like GetTexture
To do this required GetMesh to be converted to a BaseStreamHandler
Unlike GetTexture connector, no redirect URL functionality yet (this wasn't present in the first place).
2014-10-14 18:37:22 +01:00
Justin Clark-Casey (justincc) 22020927c6 Start JobEngine by default in simulator for now. 2014-10-14 17:13:53 +01:00
Justin Clark-Casey (justincc) b9b2f5686f If JobEngine is active, then use it to copy/rez attachments for an avatar entering the scene that isn't initially logging on. This will execute tasks consecutively rather than concurrently.
This has two aims
1) Reduce initial teleport failures when a foreign Hypergrid user enters a region by not holding up the teleport for attachment rez (this can be particularly costly when HG gets all assets in the object graph.
2) Reduce server load that may impact other simulator activities.
This complements existing JobEngine options that perform initial login attachment rez and appearance send in consecutive tasks.
2014-10-14 16:57:58 +01:00
Justin Clark-Casey (justincc) 275613ad83 minor: be consistent about reporting errors out of HttpServerBase 2014-10-14 00:35:15 +01:00
Justin Clark-Casey (justincc) 2935e79ca3 If the port entry in [Network] for a server is missing, then actually tell the user that's the problem rather than simply exiting silently.
Also exit with Environment.Exit(), not by aborting the thread.
2014-10-13 23:57:46 +01:00
Justin Clark-Casey (justincc) 0437d44785 Add an IConfigSource constructor to HGAssetBroker so that it can be instantiated directly for potentially handling some capabilities directly in services with HG active 2014-10-13 23:10:08 +01:00
Justin Clark-Casey (justincc) 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 to set a max client throttle when adaptive is active.
This commit also adds TestClientThrottlePerClientAndRegionLimited and TestClientThrottleAdaptiveNoLimit regression tests
2014-10-10 23:36:50 +01:00
Justin Clark-Casey (justincc) 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
Justin Clark-Casey (justincc) 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
Justin Clark-Casey (justincc) b28b31b3ee minor: remove warnings from unused fields in LocalGridServicesConnector 2014-10-09 01:30:24 +01:00
Justin Clark-Casey (justincc) 16eb9253b0 minor: Remove unused field from EntityTransferModule 2014-10-09 01:25:11 +01:00
Justin Clark-Casey (justincc) ba0707ca1e minor: remove compiler warning from unused field in SimulatorFeaturesModule 2014-10-09 01:23:53 +01:00
Justin Clark-Casey (justincc) 3e4550adf7 minor: resolve warnings from unused fields in XBakesGet and Post handlers 2014-10-09 01:08:21 +01:00
Justin Clark-Casey (justincc) e902824da7 Remove compiler warning from UserProfilesHandlers 2014-10-09 01:03:45 +01:00
Justin Clark-Casey (justincc) 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
Justin Clark-Casey (justincc) d69ab1e037 extend TestClientThrottleRegionLimited for 2 clients after testing 1. Renames to TestSingleClientThrottleRegionLimited() 2014-10-09 00:51:36 +01:00
Justin Clark-Casey (justincc) 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
Justin Clark-Casey (justincc) a83f5f2153 factor out common throttle setting byte[] array construction in ThrottleTests. 2014-10-08 22:50:34 +01:00
Justin Clark-Casey (justincc) 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
Justin Clark-Casey (justincc) 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
Justin Clark-Casey (justincc) b6eaef79dd minor: disable logging in regression test TestClientThrottleSetNoLimit 2014-10-08 20:54:09 +01:00
Justin Clark-Casey (justincc) c993067204 minor: comment out unused method in regression BasicCircuitTests 2014-10-08 20:53:39 +01:00
Justin Clark-Casey (justincc) ef39fcf465 Add basic regression test ThrottleTests.TestClientThrottleSetNoLimit 2014-10-08 20:52:17 +01:00
Justin Clark-Casey (justincc) e8337d6a51 refactor: Move test clientstack setup code out of BasicCircuitTests into OpenSim.Tests.Common.ClientStackHelpers 2014-10-08 20:17:51 +01:00
Justin Clark-Casey (justincc) 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
Justin Clark-Casey (justincc) 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
Justin Clark-Casey (justincc) 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
Justin Clark-Casey (justincc) 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
Justin Clark-Casey (justincc) 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
Justin Clark-Casey (justincc) 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
Justin Clark-Casey (justincc) 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
Justin Clark-Casey (justincc) 7ca4e2cb6f Eliminate 'max' throttle setting from server throttles report since this never applies. 2014-10-07 00:08:44 +01:00
Justin Clark-Casey (justincc) 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
Justin Clark-Casey (justincc) 4f04c0b560 minor: add apparant total to logging when client sets throttles 2014-10-06 23:39:52 +01:00
Justin Clark-Casey (justincc) b7f78bf0f7 minor: fix bug in throttle logging where arguments were mismatched 2014-10-06 23:34:27 +01:00
Justin Clark-Casey (justincc) 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
Justin Clark-Casey (justincc) 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
Justin Clark-Casey (justincc) 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
Justin Clark-Casey (justincc) c3b1c72c33 refactor: Use simpler auto-implemented property for HttpPort in GridRegion 2014-10-03 01:22:25 +01:00
Justin Clark-Casey (justincc) 277dbb9acd minor: Remove compiler warning from GridRegion in IGridService 2014-10-03 00:43:04 +01:00
Justin Clark-Casey (justincc) 6cfebd66ec minor: remove compiler warning from OpenProfileClient 2014-10-03 00:38:48 +01:00
Justin Clark-Casey (justincc) 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