aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs
diff options
context:
space:
mode:
authorBlueWall2014-09-17 20:03:54 -0400
committerBlueWall2014-09-17 20:03:54 -0400
commit96a24491222e29ba8d615d9ffaf63e72742a9cc7 (patch)
treeeddde1cac95af0c9ef1eec67f623ead3d49afc65 /OpenSim/Region/Framework/Scenes/Scene.cs
parentAdd eeyore to contributors (diff)
downloadopensim-SC-96a24491222e29ba8d615d9ffaf63e72742a9cc7.zip
opensim-SC-96a24491222e29ba8d615d9ffaf63e72742a9cc7.tar.gz
opensim-SC-96a24491222e29ba8d615d9ffaf63e72742a9cc7.tar.bz2
opensim-SC-96a24491222e29ba8d615d9ffaf63e72742a9cc7.tar.xz
Undo "Revert "Small changes to threading to send thread names to unmanaged threads. Needs Mono 3.6+ to see thread names in utilities like top -H . Some formatting of the thread name to fin in the 16 byte limit on Linux. Please test on Windows to see if the work has any adverse effects.""
Fix for break in next commit This reverts commit 376fab140227e92dbd841436509a97b87c9e7792.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs4
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 28dbccb..7e4d9ed 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1079,6 +1079,8 @@ namespace OpenSim.Region.Framework.Scenes
1079 StatsReporter = new SimStatsReporter(this); 1079 StatsReporter = new SimStatsReporter(this);
1080 StatsReporter.OnSendStatsResult += SendSimStatsPackets; 1080 StatsReporter.OnSendStatsResult += SendSimStatsPackets;
1081 StatsReporter.OnStatsIncorrect += m_sceneGraph.RecalculateStats; 1081 StatsReporter.OnStatsIncorrect += m_sceneGraph.RecalculateStats;
1082
1083 Thread.CurrentThread.Name = string.Format ("Scene:{0}", regInfo.RegionName.Replace(" ", "_"));
1082 } 1084 }
1083 1085
1084 public Scene(RegionInfo regInfo, PhysicsScene physicsScene) : base(regInfo) 1086 public Scene(RegionInfo regInfo, PhysicsScene physicsScene) : base(regInfo)
@@ -1396,7 +1398,7 @@ namespace OpenSim.Region.Framework.Scenes
1396 1398
1397 m_heartbeatThread 1399 m_heartbeatThread
1398 = Watchdog.StartThread( 1400 = Watchdog.StartThread(
1399 Heartbeat, string.Format("Heartbeat ({0})", RegionInfo.RegionName), ThreadPriority.Normal, false, false); 1401 Heartbeat, string.Format("Heartbeat-({0})", RegionInfo.RegionName.Replace(" ", "_")), ThreadPriority.Normal, false, false);
1400 1402
1401 StartScripts(); 1403 StartScripts();
1402 } 1404 }