aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorTedd Hansen2008-02-20 20:22:15 +0000
committerTedd Hansen2008-02-20 20:22:15 +0000
commit684059afdfd0260f85c3d3151443f458fa96735e (patch)
treee15a5fe7ae5948ef10bb1e16a3132acff2971f21 /OpenSim
parent* Found the land bug, yay (diff)
downloadopensim-SC_OLD-684059afdfd0260f85c3d3151443f458fa96735e.zip
opensim-SC_OLD-684059afdfd0260f85c3d3151443f458fa96735e.tar.gz
opensim-SC_OLD-684059afdfd0260f85c3d3151443f458fa96735e.tar.bz2
opensim-SC_OLD-684059afdfd0260f85c3d3151443f458fa96735e.tar.xz
div+
threads console command will list all threads. This + yesterdays naming threads patch will give a good overview of what threads we have running.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs13
-rw-r--r--OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncLSLCommandManager.cs2
2 files changed, 14 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 7461006..d47e058 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -28,6 +28,7 @@
28 28
29using System; 29using System;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Diagnostics;
31using System.IO; 32using System.IO;
32using System.Text; 33using System.Text;
33using System.Threading; 34using System.Threading;
@@ -744,6 +745,7 @@ namespace OpenSim
744 m_console.Notice("show users - show info about connected users."); 745 m_console.Notice("show users - show info about connected users.");
745 m_console.Notice("show modules - shows info about loaded modules."); 746 m_console.Notice("show modules - shows info about loaded modules.");
746 m_console.Notice("show stats - statistical information for this server not displayed in the client"); 747 m_console.Notice("show stats - statistical information for this server not displayed in the client");
748 m_console.Notice("threads - list threads");
747 m_console.Notice("shutdown - disconnect all clients and shutdown."); 749 m_console.Notice("shutdown - disconnect all clients and shutdown.");
748 m_console.Notice("config set section field value - set a config value"); 750 m_console.Notice("config set section field value - set a config value");
749 m_console.Notice("config get section field - get a config value"); 751 m_console.Notice("config get section field - get a config value");
@@ -751,6 +753,17 @@ namespace OpenSim
751 m_console.Notice("terrain help - show help for terrain commands."); 753 m_console.Notice("terrain help - show help for terrain commands.");
752 break; 754 break;
753 755
756 case "threads":
757 if (cmdparams.Length > 0)
758 {
759 int c = 0;
760 foreach (Thread t in Process.GetCurrentProcess().Threads)
761 {
762 c++;
763 m_console.Notice("THREAD", "Thread " + c + ": " + t.Name + " (" + t.ToString() + ")");
764 }
765 }
766 break;
754 case "save-xml": 767 case "save-xml":
755 if (cmdparams.Length > 0) 768 if (cmdparams.Length > 0)
756 { 769 {
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncLSLCommandManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncLSLCommandManager.cs
index 48c6525..222b8f2 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncLSLCommandManager.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncLSLCommandManager.cs
@@ -214,7 +214,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
214 // Time has passed? 214 // Time has passed?
215 if (ts.next < DateTime.Now.Ticks) 215 if (ts.next < DateTime.Now.Ticks)
216 { 216 {
217 Console.WriteLine("Time has passed: Now: " + DateTime.Now.Ticks + ", Passed: " + ts.next); 217// Console.WriteLine("Time has passed: Now: " + DateTime.Now.Ticks + ", Passed: " + ts.next);
218 // Add it to queue 218 // Add it to queue
219 m_ScriptEngine.m_EventQueueManager.AddToScriptQueue(ts.localID, ts.itemID, "timer", EventQueueManager.llDetectNull, 219 m_ScriptEngine.m_EventQueueManager.AddToScriptQueue(ts.localID, ts.itemID, "timer", EventQueueManager.llDetectNull,
220 null); 220 null);