UbitUmarov
d1f7fac570
fix merge issues
2017-07-20 14:28:26 +01:00
UbitUmarov
fe6ad384e4
merge
2017-07-20 11:30:12 +01:00
UbitUmarov
79e166e9aa
revert EnvironmentTick back to orignal clock, since change may cause issues on some code paths. Clean a bit get mesh and get texture throttle
2017-06-19 05:22:38 +01:00
UbitUmarov
c54985f8a1
Merge branch 'master' into httptests
2017-05-27 05:47:05 +01:00
UbitUmarov
7a82c7c5b2
make BlockingQueue.Dequeue timeouts more coerent (just less than watchdog timeout)
2017-05-26 00:47:08 +01:00
UbitUmarov
2777995331
Merge branch 'master' into httptests
2017-05-25 10:23:52 +01:00
UbitUmarov
65e9421058
minor changes
2017-05-25 04:24:23 +01:00
UbitUmarov
4286ae43f2
make some threads background ones
2017-05-25 01:51:53 +01:00
UbitUmarov
9a1d94f455
remove use of libomv BlockingQueue
2017-05-25 01:28:02 +01:00
UbitUmarov
254b26a7d5
fix merge
2017-01-05 19:32:57 +00:00
Melanie Thielker
b16abc8166
Massive tab and trailing space cleanup
2017-01-05 19:07:37 +00:00
UbitUmarov
e881562d34
fix drop on delayed events processing
2016-07-17 14:15:46 +01:00
UbitUmarov
442b272228
add a Drop method to PollService Event handlers, Drop requests on connections known to be lost or delay event check if they are sending a response
2016-07-17 13:20:56 +01:00
UbitUmarov
d1810866b3
simplify http textures and meshs Throttles
2016-07-16 19:53:41 +01:00
UbitUmarov
3029080d9b
change threading on GetTexture and getMesh and WebFetch Modules.
2015-11-27 07:38:54 +00:00
UbitUmarov
f16d36627f
change threading on GetTexture and GetMesh NonSharable region modules
2015-11-27 05:00:11 +00:00
UbitUmarov
36426b0db2
remove some compile warnings increasing total number by 2
2015-11-21 00:49:43 +00:00
Diva Canto
f5799ff445
That didn't actually do anything for Simian, and it broke the locahost
...
case
Revert "Also restoring proper function for Simian external GetTexture functionality."
This reverts commit 366e81b977
2015-11-14 08:10:27 -08:00
Diva Canto
366e81b977
Also restoring proper function for Simian external GetTexture functionality.
2015-10-14 14:45:21 -07:00
UbitUmarov
a11edceb00
seems to compile ( tests comented out)
2015-09-02 19:54:53 +01:00
UbitUmarov
371c9dd2af
bad merge?
2015-09-01 14:54:35 +01:00
UbitUmarov
018d855f28
turn off KeepAlive
2015-08-24 07:38:33 +01:00
UbitUmarov
fd82a0a0b7
add a Retry-After response header to the 503 sent when we are 2 busy to do
...
the request. just 503 could mean server down (?)
2015-08-19 00:26:43 +01:00
UbitUmarov
05d72f77ff
do keepalive on mesh and texture GET. Dont use reusecontext any where.
...
setting of keepalive is wrong, it should follow the requested one ( or
always as http1.1) only deny if needed (errors). KeepAlive may increase
stress on number of avaiable file descritors.
2015-08-18 21:32:03 +01:00
Diva Canto
a845c1a893
Finished implementing redirects in GetTexture.
2014-05-07 19:38:33 -07:00
Melanie
72206a0e29
Merge branch 'avination-current' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
2013-09-16 22:32:53 +01:00
root
823e8b5d19
Add support for simple external CAPS texture services
2013-09-07 17:57:02 +02:00
Melanie
21f5e67030
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
2013-08-01 01:23:24 +01:00
Mic Bowman
1299592405
Experimental comment to eneralize the handling of Linden caps when the
...
cap is something other than "localhost". A new interface for handling
external caps is supported with an example implemented for Simian. The
only linden cap supporting this interface right now is the GetTexture
cap.
2013-07-31 15:37:15 -07:00
Melanie
a7eb1b5b85
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
2013-07-24 03:50:09 +01:00
Melanie
e39156c656
Send 503 when throttling textures
2013-04-25 01:38:21 +02:00
Melanie
7a093df24b
Prevent a failed user relogi from throwing exceptions in poll services
2012-12-14 03:35:55 +01:00
Melanie
ccc81183b0
Merge commit '619c39e5144f15aca129d6d999bcc5c34133ee64' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
2012-11-20 01:20:59 +00:00
Melanie
7ad082f7c3
Merge branch 'avination' into careminster
2012-11-17 02:58:14 +00:00
Melanie
9a5679876e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs
2012-11-13 02:10:09 +00:00
Diva Canto
86903f23dd
Cleanup on region modules: gave short node id's to all of them.
2012-11-12 18:08:02 -08:00
teravus
cda127e30f
* Prep work switching the GetMeshModule over to a poll service.
...
* This still has the image throttler in it.. as is... so it's not suitable for live yet.... The throttler keeps track of the task throttle but doesn't balance the UDP throttle yet.
2012-11-09 23:55:30 -05:00
teravus
182b487243
This implements the Caps throttler. After some testing, the system seemed to be OK with me specifying allowing 1 oversized image per 70,000b/sec with at least one. Try it out, start with a low bandwidth setting and then, set your bandwidth setting middle/high and see the difference.
...
Tested with Two Clients on a region with 1800 textures all visible at once.
2012-11-05 22:05:10 -05:00
teravus
b7b96a5e4f
Another step in the chain. Pipe the throttle update to the appropriate PollServiceTextureEventArgs. Each poll service having it's own throttle member is more consistent with the model then the region module keeping track of all of them globally and better for locking too. The Poll Services object is not set static to handle multiple nearby regions on the same simulator.
...
Next step is hooking it up to HasEvents
2012-11-05 13:10:00 -05:00
teravus
4fa088bafb
Pipe Throttle Update Event to EventManager, client --> ScenePresence --> EventManager, so that modules can know when throttles are updated. The event contains no client specific data to preserve the possibility of 'multiple clients' and you must still call ControllingClient.GetThrottlesPacked(f) to see what the throttles actually are once the event fires. Hook EventManager.OnUpdateThrottle to GetTextureModule.
2012-11-04 22:57:24 -05:00
Melanie
de3ff44406
Make texture sedning use only two threads to make things less harsh on bandwidth
2012-10-14 17:10:26 +02:00
UbitUmarov
617f1b9223
just remove the damm thing
2012-09-26 16:17:49 +01:00
UbitUmarov
7e3eba1064
Seems nothing actually need the request body for getevents. so change
...
control flag to false
2012-09-26 15:41:57 +01:00
UbitUmarov
654dd289f2
more changes to PollService
2012-09-26 03:05:27 +01:00
UbitUmarov
ef3d44240e
missed change
2012-09-25 04:03:15 +01:00
UbitUmarov
2cb17d6fbb
change GetTextureModule processing
2012-09-25 03:38:45 +01:00
Melanie
68ece236a6
Protect the responses map with a lock. Also remove ugly "this." type of
...
member notation.
2012-09-23 23:55:28 +02:00
UbitUmarov
fd20ef5c91
add some locks to GetTextureModule
2012-09-17 22:35:36 +01:00
Melanie
387e59ff7f
Revamp the HTTP textures handler to allow a maximum of four fetches
...
at any time and to drop requests for avatars n longer in the scene
2012-09-14 21:24:25 +02:00
Justin Clark-Casey (justincc)
231a3bf147
Implement optional name and description on http stream handlers so that we can relate a slow request to what the handler actually does and the agent it serves, if applicable.
...
This is most useful for capabilities where the url is not self-describing.
2012-05-03 01:45:49 +01:00
