aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-03-12 21:16:05 +0000
committerJustin Clark-Casey (justincc)2012-03-19 21:28:54 +0000
commit1b4ea4f178d617824295bcb6d00842e5d0c49a56 (patch)
treef38d30d9bbf4ea457862503c70373f43deb81e31 /OpenSim/Region
parentChange OpenSim.ini.example to reflect how to actually enable prim limits, (diff)
downloadopensim-SC_OLD-1b4ea4f178d617824295bcb6d00842e5d0c49a56.zip
opensim-SC_OLD-1b4ea4f178d617824295bcb6d00842e5d0c49a56.tar.gz
opensim-SC_OLD-1b4ea4f178d617824295bcb6d00842e5d0c49a56.tar.bz2
opensim-SC_OLD-1b4ea4f178d617824295bcb6d00842e5d0c49a56.tar.xz
Add max thread and min thread information to "xengine status" region console command
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs3
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/XEngine.cs2
2 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index bc1902b..4010167 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -578,7 +578,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
578 return true; 578 return true;
579 579
580 if (!m_InSelfDelete) 580 if (!m_InSelfDelete)
581 {
582// m_log.ErrorFormat("[SCRIPT INSTANCE]: Aborting script {0} {1}", ScriptName, ItemID);
581 result.Abort(); 583 result.Abort();
584 }
582 585
583 lock (m_EventQueue) 586 lock (m_EventQueue)
584 { 587 {
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index d1cac9c..2e008d6 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -384,6 +384,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine
384 384
385 sb.AppendFormat("Unique scripts : {0}\n", m_uniqueScripts.Count); 385 sb.AppendFormat("Unique scripts : {0}\n", m_uniqueScripts.Count);
386 sb.AppendFormat("Scripts waiting for load : {0}\n", m_CompileQueue.Count); 386 sb.AppendFormat("Scripts waiting for load : {0}\n", m_CompileQueue.Count);
387 sb.AppendFormat("Max threads : {0}\n", m_ThreadPool.MaxThreads);
388 sb.AppendFormat("Min threads : {0}\n", m_ThreadPool.MinThreads);
387 sb.AppendFormat("Allocated threads : {0}\n", m_ThreadPool.ActiveThreads); 389 sb.AppendFormat("Allocated threads : {0}\n", m_ThreadPool.ActiveThreads);
388 sb.AppendFormat("In use threads : {0}\n", m_ThreadPool.InUseThreads); 390 sb.AppendFormat("In use threads : {0}\n", m_ThreadPool.InUseThreads);
389 sb.AppendFormat("Work items waiting : {0}\n", m_ThreadPool.WaitingCallbacks); 391 sb.AppendFormat("Work items waiting : {0}\n", m_ThreadPool.WaitingCallbacks);