diff options
author | BlueWall | 2014-09-17 18:11:41 -0400 |
---|---|---|
committer | BlueWall | 2014-09-17 18:11:41 -0400 |
commit | 376fab140227e92dbd841436509a97b87c9e7792 (patch) | |
tree | f9c7151984ed47ad8eac25a72f7bac3fa6ea22ae /OpenSim/Region/Framework | |
parent | Small changes to threading to send thread names to unmanaged threads. Needs M... (diff) | |
download | opensim-SC_OLD-376fab140227e92dbd841436509a97b87c9e7792.zip opensim-SC_OLD-376fab140227e92dbd841436509a97b87c9e7792.tar.gz opensim-SC_OLD-376fab140227e92dbd841436509a97b87c9e7792.tar.bz2 opensim-SC_OLD-376fab140227e92dbd841436509a97b87c9e7792.tar.xz |
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."
This reverts commit af286d5fcb688e8b64202b6deca4f249e9a2b6b8.
Issue with Jenkins builds
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 7e4d9ed..28dbccb 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -1079,8 +1079,6 @@ 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(" ", "_")); | ||
1084 | } | 1082 | } |
1085 | 1083 | ||
1086 | public Scene(RegionInfo regInfo, PhysicsScene physicsScene) : base(regInfo) | 1084 | public Scene(RegionInfo regInfo, PhysicsScene physicsScene) : base(regInfo) |
@@ -1398,7 +1396,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1398 | 1396 | ||
1399 | m_heartbeatThread | 1397 | m_heartbeatThread |
1400 | = Watchdog.StartThread( | 1398 | = Watchdog.StartThread( |
1401 | Heartbeat, string.Format("Heartbeat-({0})", RegionInfo.RegionName.Replace(" ", "_")), ThreadPriority.Normal, false, false); | 1399 | Heartbeat, string.Format("Heartbeat ({0})", RegionInfo.RegionName), ThreadPriority.Normal, false, false); |
1402 | 1400 | ||
1403 | StartScripts(); | 1401 | StartScripts(); |
1404 | } | 1402 | } |