diff options
| author | Justin Clark-Casey (justincc) | 2012-02-24 05:15:47 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-02-24 05:15:47 +0000 |
| commit | 9e6ffe779841f470c0e2dbe673ef4b10253bcd84 (patch) | |
| tree | 2fc70de1f59274bd287b20a1637c848426ab3667 /OpenSim/Framework | |
| parent | Get rid of some of the identical exception catching in Scene.Update(). (diff) | |
| download | opensim-SC-9e6ffe779841f470c0e2dbe673ef4b10253bcd84.zip opensim-SC-9e6ffe779841f470c0e2dbe673ef4b10253bcd84.tar.gz opensim-SC-9e6ffe779841f470c0e2dbe673ef4b10253bcd84.tar.bz2 opensim-SC-9e6ffe779841f470c0e2dbe673ef4b10253bcd84.tar.xz | |
Rename Watchdog.GetThreads() to GetThreadsInfo() to reflect what it actually returns and for consistency.
Diffstat (limited to 'OpenSim/Framework')
| -rw-r--r-- | OpenSim/Framework/Servers/BaseOpenSimServer.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Framework/Watchdog.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs index 0dd01af..6a3135e 100644 --- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs +++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs | |||
| @@ -247,7 +247,7 @@ namespace OpenSim.Framework.Servers | |||
| 247 | string reportFormat = "{0,6} {1,35} {2,16} {3,13} {4,10} {5,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.GetThreadsInfo(); |
| 251 | 251 | ||
| 252 | sb.Append(threads.Length + " threads are being tracked:" + Environment.NewLine); | 252 | sb.Append(threads.Length + " threads are being tracked:" + Environment.NewLine); |
| 253 | 253 | ||
diff --git a/OpenSim/Framework/Watchdog.cs b/OpenSim/Framework/Watchdog.cs index e443f0a..4891a66 100644 --- a/OpenSim/Framework/Watchdog.cs +++ b/OpenSim/Framework/Watchdog.cs | |||
| @@ -230,7 +230,7 @@ namespace OpenSim.Framework | |||
| 230 | /// Get currently watched threads for diagnostic purposes | 230 | /// Get currently watched threads for diagnostic purposes |
| 231 | /// </summary> | 231 | /// </summary> |
| 232 | /// <returns></returns> | 232 | /// <returns></returns> |
| 233 | public static ThreadWatchdogInfo[] GetThreads() | 233 | public static ThreadWatchdogInfo[] GetThreadsInfo() |
| 234 | { | 234 | { |
| 235 | lock (m_threads) | 235 | lock (m_threads) |
| 236 | return m_threads.Values.ToArray(); | 236 | return m_threads.Values.ToArray(); |