aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Monitoring
diff options
context:
space:
mode:
authorBlueWall2014-09-17 18:11:41 -0400
committerBlueWall2014-09-17 18:11:41 -0400
commit376fab140227e92dbd841436509a97b87c9e7792 (patch)
treef9c7151984ed47ad8eac25a72f7bac3fa6ea22ae /OpenSim/Framework/Monitoring
parentSmall changes to threading to send thread names to unmanaged threads. Needs M... (diff)
downloadopensim-SC-376fab140227e92dbd841436509a97b87c9e7792.zip
opensim-SC-376fab140227e92dbd841436509a97b87c9e7792.tar.gz
opensim-SC-376fab140227e92dbd841436509a97b87c9e7792.tar.bz2
opensim-SC-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/Framework/Monitoring')
-rw-r--r--OpenSim/Framework/Monitoring/Watchdog.cs13
1 files changed, 6 insertions, 7 deletions
diff --git a/OpenSim/Framework/Monitoring/Watchdog.cs b/OpenSim/Framework/Monitoring/Watchdog.cs
index e9f22f1..e9e7bd2 100644
--- a/OpenSim/Framework/Monitoring/Watchdog.cs
+++ b/OpenSim/Framework/Monitoring/Watchdog.cs
@@ -87,7 +87,7 @@ namespace OpenSim.Framework.Monitoring
87 /// </summary> 87 /// </summary>
88 public Stat Stat { get; set; } 88 public Stat Stat { get; set; }
89 89
90 public ThreadWatchdogInfo(Thread thread, int timeout, string name) 90 public ThreadWatchdogInfo(Thread thread, int timeout)
91 { 91 {
92 Thread = thread; 92 Thread = thread;
93 Timeout = timeout; 93 Timeout = timeout;
@@ -96,8 +96,8 @@ namespace OpenSim.Framework.Monitoring
96 96
97 Stat 97 Stat
98 = new Stat( 98 = new Stat(
99 name, 99 thread.Name,
100 string.Format("Last update of thread {0}", name), 100 string.Format("Last update of thread {0}", thread.Name),
101 "", 101 "",
102 "ms", 102 "ms",
103 "server", 103 "server",
@@ -216,11 +216,12 @@ namespace OpenSim.Framework.Monitoring
216 bool alarmIfTimeout, Func<string> alarmMethod, int timeout, bool log = true) 216 bool alarmIfTimeout, Func<string> alarmMethod, int timeout, bool log = true)
217 { 217 {
218 Thread thread = new Thread(start); 218 Thread thread = new Thread(start);
219 thread.Name = name;
219 thread.Priority = priority; 220 thread.Priority = priority;
220 thread.IsBackground = isBackground; 221 thread.IsBackground = isBackground;
221 222
222 ThreadWatchdogInfo twi 223 ThreadWatchdogInfo twi
223 = new ThreadWatchdogInfo(thread, timeout, name) 224 = new ThreadWatchdogInfo(thread, timeout)
224 { AlarmIfTimeout = alarmIfTimeout, AlarmMethod = alarmMethod }; 225 { AlarmIfTimeout = alarmIfTimeout, AlarmMethod = alarmMethod };
225 226
226 if (log) 227 if (log)
@@ -229,10 +230,8 @@ namespace OpenSim.Framework.Monitoring
229 230
230 lock (m_threads) 231 lock (m_threads)
231 m_threads.Add(twi.Thread.ManagedThreadId, twi); 232 m_threads.Add(twi.Thread.ManagedThreadId, twi);
232
233 thread.Start();
234 thread.Name = name;
235 233
234 thread.Start();
236 235
237 return thread; 236 return thread;
238 } 237 }