aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2014-09-04 18:24:59 +0100
committerJustin Clark-Casey (justincc)2014-09-04 18:24:59 +0100
commite4d16e67955cf40861caf31116efe6e727eabdfa (patch)
tree5e3ec530b19aa3a3e0f51d94680f0a00c358fc49
parentFor processing outbound http requests in the XMLRPCModule, start the thread t... (diff)
downloadopensim-SC_OLD-e4d16e67955cf40861caf31116efe6e727eabdfa.zip
opensim-SC_OLD-e4d16e67955cf40861caf31116efe6e727eabdfa.tar.gz
opensim-SC_OLD-e4d16e67955cf40861caf31116efe6e727eabdfa.tar.bz2
opensim-SC_OLD-e4d16e67955cf40861caf31116efe6e727eabdfa.tar.xz
Make LLUDP output queue refill thread active by default, since load tests have shown that this has better scalability.
For testing, previous behaviour can be restored with the console command "debug lludp oqre stop" at runtime.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs2
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/OutgoingQueueRefillEngine.cs2
2 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index 87aa37d..e879e76 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -447,6 +447,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
447 { 447 {
448 StartInbound(); 448 StartInbound();
449 StartOutbound(); 449 StartOutbound();
450 OqrEngine.Start();
450 451
451 m_elapsedMSSinceLastStatReport = Environment.TickCount; 452 m_elapsedMSSinceLastStatReport = Environment.TickCount;
452 } 453 }
@@ -491,6 +492,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
491 m_log.Info("[LLUDPSERVER]: Shutting down the LLUDP server for " + Scene.Name); 492 m_log.Info("[LLUDPSERVER]: Shutting down the LLUDP server for " + Scene.Name);
492 base.StopOutbound(); 493 base.StopOutbound();
493 base.StopInbound(); 494 base.StopInbound();
495 OqrEngine.Stop();
494 } 496 }
495 497
496 protected override bool EnablePools() 498 protected override bool EnablePools()
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/OutgoingQueueRefillEngine.cs b/OpenSim/Region/ClientStack/Linden/UDP/OutgoingQueueRefillEngine.cs
index 0659d8e..069c9c8 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/OutgoingQueueRefillEngine.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/OutgoingQueueRefillEngine.cs
@@ -92,7 +92,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
92 "debug lludp oqre", 92 "debug lludp oqre",
93 "debug lludp oqre <start|stop|status>", 93 "debug lludp oqre <start|stop|status>",
94 "Start, stop or get status of OutgoingQueueRefillEngine.", 94 "Start, stop or get status of OutgoingQueueRefillEngine.",
95 "Experimental.", 95 "If stopped then refill requests are processed directly via the threadpool.",
96 HandleOqreCommand); 96 HandleOqreCommand);
97 } 97 }
98 98