aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers
diff options
context:
space:
mode:
authorJohn Hurliman2009-10-05 16:41:19 -0700
committerJohn Hurliman2009-10-05 16:41:19 -0700
commita76a1afda84c3b2e23820af9b7f2c5ab3b2b97e0 (patch)
tree7419c7ac451dc210c8f02ffcb60e6900615460f5 /OpenSim/Framework/Servers
parentAdded CloseDBConnection() to replace the old CloseReaderCommand(). This will ... (diff)
parent* GridServerPostHandler.cs: Try/catch in Handle (diff)
downloadopensim-SC-a76a1afda84c3b2e23820af9b7f2c5ab3b2b97e0.zip
opensim-SC-a76a1afda84c3b2e23820af9b7f2c5ab3b2b97e0.tar.gz
opensim-SC-a76a1afda84c3b2e23820af9b7f2c5ab3b2b97e0.tar.bz2
opensim-SC-a76a1afda84c3b2e23820af9b7f2c5ab3b2b97e0.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework/Servers')
-rw-r--r--OpenSim/Framework/Servers/BaseOpenSimServer.cs8
1 files changed, 7 insertions, 1 deletions
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index 632b551..56155dd 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -238,7 +238,7 @@ namespace OpenSim.Framework.Servers
238 List<Thread> threads = ThreadTracker.GetThreads(); 238 List<Thread> threads = ThreadTracker.GetThreads();
239 if (threads == null) 239 if (threads == null)
240 { 240 {
241 sb.Append("Thread tracking is only enabled in DEBUG mode."); 241 sb.Append("OpenSim thread tracking is only enabled in DEBUG mode.");
242 } 242 }
243 else 243 else
244 { 244 {
@@ -264,6 +264,12 @@ namespace OpenSim.Framework.Servers
264 } 264 }
265 } 265 }
266 } 266 }
267 int workers = 0, ports = 0, maxWorkers = 0, maxPorts = 0;
268 ThreadPool.GetAvailableThreads(out workers, out ports);
269 ThreadPool.GetMaxThreads(out maxWorkers, out maxPorts);
270
271 sb.Append(Environment.NewLine + "*** ThreadPool threads ***" + Environment.NewLine);
272 sb.Append("workers: " + (maxWorkers - workers) + " (" + maxWorkers + "); ports: " + (maxPorts - ports) + " (" + maxPorts + ")" + Environment.NewLine);
267 273
268 return sb.ToString(); 274 return sb.ToString();
269 } 275 }