aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-11-15 23:34:28 +0000
committerJustin Clark-Casey (justincc)2011-11-15 23:34:28 +0000
commit31ffd5450bab751f4df396b7d099367246b2f552 (patch)
treeca321d59ab5da81e0b540dc7d199ec1b5ca72ca4
parentfix build break on UserManagementModule. (diff)
downloadopensim-SC_OLD-31ffd5450bab751f4df396b7d099367246b2f552.zip
opensim-SC_OLD-31ffd5450bab751f4df396b7d099367246b2f552.tar.gz
opensim-SC_OLD-31ffd5450bab751f4df396b7d099367246b2f552.tar.bz2
opensim-SC_OLD-31ffd5450bab751f4df396b7d099367246b2f552.tar.xz
Make tracked per scene thread names conform to the majorirty format.
This is <thread-name> (<region-name>)
-rw-r--r--OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs9
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs4
2 files changed, 9 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
index 00d7d55..95c727f 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -65,7 +65,6 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
65 65
66 private OpenSim.Framework.BlockingQueue<MapRequestState> requests = new OpenSim.Framework.BlockingQueue<MapRequestState>(); 66 private OpenSim.Framework.BlockingQueue<MapRequestState> requests = new OpenSim.Framework.BlockingQueue<MapRequestState>();
67 67
68 //private IConfig m_config;
69 protected Scene m_scene; 68 protected Scene m_scene;
70 private List<MapBlockData> cachedMapBlocks = new List<MapBlockData>(); 69 private List<MapBlockData> cachedMapBlocks = new List<MapBlockData>();
71 private int cachedTime = 0; 70 private int cachedTime = 0;
@@ -348,7 +347,11 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
348 347
349// m_log.Debug("[WORLD MAP]: Starting remote MapItem request thread"); 348// m_log.Debug("[WORLD MAP]: Starting remote MapItem request thread");
350 349
351 Watchdog.StartThread(process, "MapItemRequestThread", ThreadPriority.BelowNormal, true); 350 Watchdog.StartThread(
351 process,
352 string.Format("MapItemRequestThread ({0})", m_scene.RegionInfo.RegionName),
353 ThreadPriority.BelowNormal,
354 true);
352 } 355 }
353 356
354 /// <summary> 357 /// <summary>
@@ -357,7 +360,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
357 private void StopThread() 360 private void StopThread()
358 { 361 {
359 MapRequestState st = new MapRequestState(); 362 MapRequestState st = new MapRequestState();
360 st.agentID=STOP_UUID; 363 st.agentID = STOP_UUID;
361 st.EstateID=0; 364 st.EstateID=0;
362 st.flags=0; 365 st.flags=0;
363 st.godlike=false; 366 st.godlike=false;
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index fb4b545..c1cbbd4 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1145,7 +1145,9 @@ namespace OpenSim.Region.Framework.Scenes
1145 } 1145 }
1146 m_lastUpdate = Util.EnvironmentTickCount(); 1146 m_lastUpdate = Util.EnvironmentTickCount();
1147 1147
1148 HeartbeatThread = Watchdog.StartThread(Heartbeat, "Heartbeat for region " + RegionInfo.RegionName, ThreadPriority.Normal, false); 1148 HeartbeatThread
1149 = Watchdog.StartThread(
1150 Heartbeat, string.Format("Heartbeat ({0})", RegionInfo.RegionName), ThreadPriority.Normal, false);
1149 } 1151 }
1150 1152
1151 /// <summary> 1153 /// <summary>