diff options
| author | Justin Clarke Casey | 2008-10-28 15:01:43 +0000 |
|---|---|---|
| committer | Justin Clarke Casey | 2008-10-28 15:01:43 +0000 |
| commit | 2a9796e2aa17aeb8143dc7f30a076b0d03da2d12 (patch) | |
| tree | 20a4c70c5430ba1c82278ae7758201b12f33504f /OpenSim | |
| parent | Thank you kindly, Mircea Kitsune for a patch that solves: (diff) | |
| download | opensim-SC_OLD-2a9796e2aa17aeb8143dc7f30a076b0d03da2d12.zip opensim-SC_OLD-2a9796e2aa17aeb8143dc7f30a076b0d03da2d12.tar.gz opensim-SC_OLD-2a9796e2aa17aeb8143dc7f30a076b0d03da2d12.tar.bz2 opensim-SC_OLD-2a9796e2aa17aeb8143dc7f30a076b0d03da2d12.tar.xz | |
* Apply http://opensimulator.org/mantis/view.php?id=2482
* Stop 'show threads' throwing an exception if a thread is dead
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Framework/Servers/BaseOpenSimServer.cs | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs index f5e5c18..499b2f8 100644 --- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs +++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs | |||
| @@ -141,9 +141,23 @@ namespace OpenSim.Framework.Servers | |||
| 141 | sb.Append(threads.Count + " threads are being tracked:" + Environment.NewLine); | 141 | sb.Append(threads.Count + " threads are being tracked:" + Environment.NewLine); |
| 142 | foreach (Thread t in threads) | 142 | foreach (Thread t in threads) |
| 143 | { | 143 | { |
| 144 | sb.Append( | 144 | if (t.IsAlive) |
| 145 | "ID: " + t.ManagedThreadId + ", Name: " + t.Name + ", Alive: " + t.IsAlive | 145 | { |
| 146 | + ", Pri: " + t.Priority + ", State: " + t.ThreadState + Environment.NewLine); | 146 | sb.Append( |
| 147 | "ID: " + t.ManagedThreadId + ", Name: " + t.Name + ", Alive: " + t.IsAlive | ||
| 148 | + ", Pri: " + t.Priority + ", State: " + t.ThreadState + Environment.NewLine); | ||
| 149 | } | ||
| 150 | else | ||
| 151 | { | ||
| 152 | try | ||
| 153 | { | ||
| 154 | sb.Append("ID: " + t.ManagedThreadId + ", Name: " + t.Name + ", DEAD" + Environment.NewLine); | ||
| 155 | } | ||
| 156 | catch (Exception e) | ||
| 157 | { | ||
| 158 | sb.Append("THREAD ERROR" + Environment.NewLine); | ||
| 159 | } | ||
| 160 | } | ||
| 147 | } | 161 | } |
| 148 | } | 162 | } |
| 149 | 163 | ||