diff options
author | Justin Clark-Casey (justincc) | 2011-11-15 23:24:51 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-11-15 23:24:51 +0000 |
commit | aea547cd11e4baa24cad12e13160e5ff2250a69f (patch) | |
tree | 952386c40f3c794e1a7dea8d7c8a6564f941e618 /OpenSim/Framework/Servers | |
parent | Do proper locking of UserManagementModule.m_UserCache when getting. (diff) | |
download | opensim-SC_OLD-aea547cd11e4baa24cad12e13160e5ff2250a69f.zip opensim-SC_OLD-aea547cd11e4baa24cad12e13160e5ff2250a69f.tar.gz opensim-SC_OLD-aea547cd11e4baa24cad12e13160e5ff2250a69f.tar.bz2 opensim-SC_OLD-aea547cd11e4baa24cad12e13160e5ff2250a69f.tar.xz |
fix build break on UserManagementModule.
This also adds time since started to "show threads". Unfortunately these two changes got mixed in.
Diffstat (limited to 'OpenSim/Framework/Servers')
-rw-r--r-- | OpenSim/Framework/Servers/BaseOpenSimServer.cs | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs index 41a0e4e..db063f1 100644 --- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs +++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs | |||
@@ -244,7 +244,7 @@ namespace OpenSim.Framework.Servers | |||
244 | protected string GetThreadsReport() | 244 | protected string GetThreadsReport() |
245 | { | 245 | { |
246 | // This should be a constant field. | 246 | // This should be a constant field. |
247 | string reportFormat = "{0,6} {1,35} {2,16} {3,10} {4,30}"; | 247 | string reportFormat = "{0,6} {1,35} {2,16} {3,13} {4,10} {5,30}"; |
248 | 248 | ||
249 | StringBuilder sb = new StringBuilder(); | 249 | StringBuilder sb = new StringBuilder(); |
250 | Watchdog.ThreadWatchdogInfo[] threads = Watchdog.GetThreads(); | 250 | Watchdog.ThreadWatchdogInfo[] threads = Watchdog.GetThreads(); |
@@ -253,7 +253,7 @@ namespace OpenSim.Framework.Servers | |||
253 | 253 | ||
254 | int timeNow = Util.EnvironmentTickCount(); | 254 | int timeNow = Util.EnvironmentTickCount(); |
255 | 255 | ||
256 | sb.AppendFormat(reportFormat, "ID", "NAME", "LAST UPDATE (MS)", "PRIORITY", "STATE"); | 256 | sb.AppendFormat(reportFormat, "ID", "NAME", "LAST UPDATE (MS)", "LIFETIME (MS)", "PRIORITY", "STATE"); |
257 | sb.Append(Environment.NewLine); | 257 | sb.Append(Environment.NewLine); |
258 | 258 | ||
259 | foreach (Watchdog.ThreadWatchdogInfo twi in threads) | 259 | foreach (Watchdog.ThreadWatchdogInfo twi in threads) |
@@ -262,8 +262,12 @@ namespace OpenSim.Framework.Servers | |||
262 | 262 | ||
263 | sb.AppendFormat( | 263 | sb.AppendFormat( |
264 | reportFormat, | 264 | reportFormat, |
265 | //t.ManagedThreadId, t.Name, string.Format("{0} ms", timeNow - twi.LastTick), t.Priority, t.ThreadState); | 265 | t.ManagedThreadId, |
266 | t.ManagedThreadId, t.Name, timeNow - twi.LastTick, t.Priority, t.ThreadState); | 266 | t.Name, |
267 | timeNow - twi.LastTick, | ||
268 | timeNow - twi.FirstTick, | ||
269 | t.Priority, | ||
270 | t.ThreadState); | ||
267 | 271 | ||
268 | sb.Append(Environment.NewLine); | 272 | sb.Append(Environment.NewLine); |
269 | } | 273 | } |