diff options
| author | John Hurliman | 2009-10-19 15:19:37 -0700 |
|---|---|---|
| committer | John Hurliman | 2009-10-19 15:19:37 -0700 |
| commit | bd03cbd8156e2044eed89ba2774bab43b9931aa1 (patch) | |
| tree | c6dc15d4028b2d103b89296ac68b84482b77f5e8 /OpenSim/Framework/Servers | |
| parent | * Change Util.FireAndForget to use ThreadPool.UnsafeQueueUserWorkItem(). This... (diff) | |
| parent | Minor formatting cleanup. (diff) | |
| download | opensim-SC-bd03cbd8156e2044eed89ba2774bab43b9931aa1.zip opensim-SC-bd03cbd8156e2044eed89ba2774bab43b9931aa1.tar.gz opensim-SC-bd03cbd8156e2044eed89ba2774bab43b9931aa1.tar.bz2 opensim-SC-bd03cbd8156e2044eed89ba2774bab43b9931aa1.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into prioritization
Diffstat (limited to 'OpenSim/Framework/Servers')
| -rw-r--r-- | OpenSim/Framework/Servers/BaseOpenSimServer.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs index 845a9fe..0d93ff7 100644 --- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs +++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs | |||
| @@ -246,7 +246,7 @@ namespace OpenSim.Framework.Servers | |||
| 246 | foreach (ProcessThread t in threads) | 246 | foreach (ProcessThread t in threads) |
| 247 | { | 247 | { |
| 248 | sb.Append("ID: " + t.Id + ", TotalProcessorTime: " + t.TotalProcessorTime + ", TimeRunning: " + | 248 | sb.Append("ID: " + t.Id + ", TotalProcessorTime: " + t.TotalProcessorTime + ", TimeRunning: " + |
| 249 | (DateTime.Now - t.StartTime) + ", Pri: " + t.CurrentPriority + ", State: " + t.ThreadState ); | 249 | (DateTime.Now - t.StartTime) + ", Pri: " + t.CurrentPriority + ", State: " + t.ThreadState); |
| 250 | if (t.ThreadState == System.Diagnostics.ThreadState.Wait) | 250 | if (t.ThreadState == System.Diagnostics.ThreadState.Wait) |
| 251 | sb.Append(", Reason: " + t.WaitReason + Environment.NewLine); | 251 | sb.Append(", Reason: " + t.WaitReason + Environment.NewLine); |
| 252 | else | 252 | else |