aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-07-06 00:29:19 +0100
committerJustin Clark-Casey (justincc)2013-07-06 00:29:19 +0100
commit67407024a2e0b6e27f526cc2312e93fd867a855b (patch)
tree6a05354fc616ceb5f03ad462bcc418652b1d4242 /OpenSim
parentrefactor: Make stats and sim status simpler by extending BaseStreamHandler li... (diff)
downloadopensim-SC_OLD-67407024a2e0b6e27f526cc2312e93fd867a855b.zip
opensim-SC_OLD-67407024a2e0b6e27f526cc2312e93fd867a855b.tar.gz
opensim-SC_OLD-67407024a2e0b6e27f526cc2312e93fd867a855b.tar.bz2
opensim-SC_OLD-67407024a2e0b6e27f526cc2312e93fd867a855b.tar.xz
Update thread watchdog on GridServiceRequestThread periodically and turn off alarming
Unfortunately, alarm can spuriously go off if the thread blocks for a long time on an empty queue.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/CoreModules/Framework/GridServiceThrottle/GridServiceThrottleModule.cs4
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/GridServiceThrottle/GridServiceThrottleModule.cs b/OpenSim/Region/CoreModules/Framework/GridServiceThrottle/GridServiceThrottleModule.cs
index a662731..f1eb1ad 100644
--- a/OpenSim/Region/CoreModules/Framework/GridServiceThrottle/GridServiceThrottleModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/GridServiceThrottle/GridServiceThrottleModule.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Region.CoreModules.Framework
58 "GridServiceRequestThread", 58 "GridServiceRequestThread",
59 ThreadPriority.BelowNormal, 59 ThreadPriority.BelowNormal,
60 true, 60 true,
61 true); 61 false);
62 } 62 }
63 63
64 public void AddRegion(Scene scene) 64 public void AddRegion(Scene scene)
@@ -137,6 +137,8 @@ namespace OpenSim.Region.CoreModules.Framework
137 { 137 {
138 while (true) 138 while (true)
139 { 139 {
140 Watchdog.UpdateThread();
141
140 GridRegionRequest request = m_RequestQueue.Dequeue(); 142 GridRegionRequest request = m_RequestQueue.Dequeue();
141 GridRegion r = m_scenes[0].GridService.GetRegionByUUID(UUID.Zero, request.regionID); 143 GridRegion r = m_scenes[0].GridService.GetRegionByUUID(UUID.Zero, request.regionID);
142 144