diff options
author | Diva Canto | 2013-08-07 08:02:36 -0700 |
---|---|---|
committer | Diva Canto | 2013-08-07 08:02:36 -0700 |
commit | 6b9a65972c2ca67b0574f06ec77cab12cf3c1742 (patch) | |
tree | 05cf2bed80368e880791974b7bdce3dcf02bcbcd /OpenSim | |
parent | Fixed incomplete commit r/23317 -- see_into_region. Put the guard around esta... (diff) | |
parent | Add file missing from last commit 4c2f6de (diff) | |
download | opensim-SC_OLD-6b9a65972c2ca67b0574f06ec77cab12cf3c1742.zip opensim-SC_OLD-6b9a65972c2ca67b0574f06ec77cab12cf3c1742.tar.gz opensim-SC_OLD-6b9a65972c2ca67b0574f06ec77cab12cf3c1742.tar.bz2 opensim-SC_OLD-6b9a65972c2ca67b0574f06ec77cab12cf3c1742.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Framework/Monitoring/StatsLogger.cs | 108 | ||||
-rw-r--r-- | OpenSim/Framework/Monitoring/StatsManager.cs | 52 | ||||
-rw-r--r-- | OpenSim/Framework/Servers/ServerBase.cs | 23 |
3 files changed, 171 insertions, 12 deletions
diff --git a/OpenSim/Framework/Monitoring/StatsLogger.cs b/OpenSim/Framework/Monitoring/StatsLogger.cs new file mode 100644 index 0000000..fa2e1b6 --- /dev/null +++ b/OpenSim/Framework/Monitoring/StatsLogger.cs | |||
@@ -0,0 +1,108 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | using System; | ||
29 | using System.Reflection; | ||
30 | using System.Timers; | ||
31 | using log4net; | ||
32 | |||
33 | namespace OpenSim.Framework.Monitoring | ||
34 | { | ||
35 | /// <summary> | ||
36 | /// Provides a means to continuously log stats for debugging purposes. | ||
37 | /// </summary> | ||
38 | public static class StatsLogger | ||
39 | { | ||
40 | private static readonly ILog m_statsLog = LogManager.GetLogger("special.StatsLogger"); | ||
41 | |||
42 | private static Timer m_loggingTimer; | ||
43 | private static int m_statsLogIntervalMs = 5000; | ||
44 | |||
45 | public static void RegisterConsoleCommands(ICommandConsole console) | ||
46 | { | ||
47 | console.Commands.AddCommand( | ||
48 | "Debug", | ||
49 | false, | ||
50 | "debug stats record", | ||
51 | "debug stats record start|stop", | ||
52 | "Control whether stats are being regularly recorded to a separate file.", | ||
53 | "For debug purposes. Experimental.", | ||
54 | HandleStatsRecordCommand); | ||
55 | } | ||
56 | |||
57 | public static void HandleStatsRecordCommand(string module, string[] cmd) | ||
58 | { | ||
59 | ICommandConsole con = MainConsole.Instance; | ||
60 | |||
61 | if (cmd.Length != 4) | ||
62 | { | ||
63 | con.Output("Usage: debug stats record start|stop"); | ||
64 | return; | ||
65 | } | ||
66 | |||
67 | if (cmd[3] == "start") | ||
68 | { | ||
69 | Start(); | ||
70 | con.OutputFormat("Now recording all stats very {0}ms to file", m_statsLogIntervalMs); | ||
71 | } | ||
72 | else if (cmd[3] == "stop") | ||
73 | { | ||
74 | Stop(); | ||
75 | con.Output("Stopped recording stats to file."); | ||
76 | } | ||
77 | } | ||
78 | |||
79 | public static void Start() | ||
80 | { | ||
81 | if (m_loggingTimer != null) | ||
82 | Stop(); | ||
83 | |||
84 | m_loggingTimer = new Timer(m_statsLogIntervalMs); | ||
85 | m_loggingTimer.AutoReset = false; | ||
86 | m_loggingTimer.Elapsed += Log; | ||
87 | m_loggingTimer.Start(); | ||
88 | } | ||
89 | |||
90 | public static void Stop() | ||
91 | { | ||
92 | if (m_loggingTimer != null) | ||
93 | { | ||
94 | m_loggingTimer.Stop(); | ||
95 | } | ||
96 | } | ||
97 | |||
98 | private static void Log(object sender, ElapsedEventArgs e) | ||
99 | { | ||
100 | m_statsLog.InfoFormat("*** STATS REPORT AT {0} ***", DateTime.Now); | ||
101 | |||
102 | foreach (string report in StatsManager.GetAllStatsReports()) | ||
103 | m_statsLog.Info(report); | ||
104 | |||
105 | m_loggingTimer.Start(); | ||
106 | } | ||
107 | } | ||
108 | } \ No newline at end of file | ||
diff --git a/OpenSim/Framework/Monitoring/StatsManager.cs b/OpenSim/Framework/Monitoring/StatsManager.cs index 87197f4..c8e838c 100644 --- a/OpenSim/Framework/Monitoring/StatsManager.cs +++ b/OpenSim/Framework/Monitoring/StatsManager.cs | |||
@@ -81,6 +81,8 @@ namespace OpenSim.Framework.Monitoring | |||
81 | + "More than one name can be given separated by spaces.\n" | 81 | + "More than one name can be given separated by spaces.\n" |
82 | + "THIS STATS FACILITY IS EXPERIMENTAL AND DOES NOT YET CONTAIN ALL STATS", | 82 | + "THIS STATS FACILITY IS EXPERIMENTAL AND DOES NOT YET CONTAIN ALL STATS", |
83 | HandleShowStatsCommand); | 83 | HandleShowStatsCommand); |
84 | |||
85 | StatsLogger.RegisterConsoleCommands(console); | ||
84 | } | 86 | } |
85 | 87 | ||
86 | public static void HandleShowStatsCommand(string module, string[] cmd) | 88 | public static void HandleShowStatsCommand(string module, string[] cmd) |
@@ -145,29 +147,55 @@ namespace OpenSim.Framework.Monitoring | |||
145 | } | 147 | } |
146 | } | 148 | } |
147 | 149 | ||
148 | private static void OutputAllStatsToConsole(ICommandConsole con) | 150 | public static List<string> GetAllStatsReports() |
149 | { | 151 | { |
152 | List<string> reports = new List<string>(); | ||
153 | |||
150 | foreach (var category in RegisteredStats.Values) | 154 | foreach (var category in RegisteredStats.Values) |
151 | { | 155 | reports.AddRange(GetCategoryStatsReports(category)); |
152 | OutputCategoryStatsToConsole(con, category); | 156 | |
153 | } | 157 | return reports; |
158 | } | ||
159 | |||
160 | private static void OutputAllStatsToConsole(ICommandConsole con) | ||
161 | { | ||
162 | foreach (string report in GetAllStatsReports()) | ||
163 | con.Output(report); | ||
164 | } | ||
165 | |||
166 | private static List<string> GetCategoryStatsReports( | ||
167 | SortedDictionary<string, SortedDictionary<string, Stat>> category) | ||
168 | { | ||
169 | List<string> reports = new List<string>(); | ||
170 | |||
171 | foreach (var container in category.Values) | ||
172 | reports.AddRange(GetContainerStatsReports(container)); | ||
173 | |||
174 | return reports; | ||
154 | } | 175 | } |
155 | 176 | ||
156 | private static void OutputCategoryStatsToConsole( | 177 | private static void OutputCategoryStatsToConsole( |
157 | ICommandConsole con, SortedDictionary<string, SortedDictionary<string, Stat>> category) | 178 | ICommandConsole con, SortedDictionary<string, SortedDictionary<string, Stat>> category) |
158 | { | 179 | { |
159 | foreach (var container in category.Values) | 180 | foreach (string report in GetCategoryStatsReports(category)) |
160 | { | 181 | con.Output(report); |
161 | OutputContainerStatsToConsole(con, container); | ||
162 | } | ||
163 | } | 182 | } |
164 | 183 | ||
165 | private static void OutputContainerStatsToConsole( ICommandConsole con, SortedDictionary<string, Stat> container) | 184 | private static List<string> GetContainerStatsReports(SortedDictionary<string, Stat> container) |
166 | { | 185 | { |
186 | List<string> reports = new List<string>(); | ||
187 | |||
167 | foreach (Stat stat in container.Values) | 188 | foreach (Stat stat in container.Values) |
168 | { | 189 | reports.Add(stat.ToConsoleString()); |
169 | con.Output(stat.ToConsoleString()); | 190 | |
170 | } | 191 | return reports; |
192 | } | ||
193 | |||
194 | private static void OutputContainerStatsToConsole( | ||
195 | ICommandConsole con, SortedDictionary<string, Stat> container) | ||
196 | { | ||
197 | foreach (string report in GetContainerStatsReports(container)) | ||
198 | con.Output(report); | ||
171 | } | 199 | } |
172 | 200 | ||
173 | // Creates an OSDMap of the format: | 201 | // Creates an OSDMap of the format: |
diff --git a/OpenSim/Framework/Servers/ServerBase.cs b/OpenSim/Framework/Servers/ServerBase.cs index 1bee6a3..c258ff6 100644 --- a/OpenSim/Framework/Servers/ServerBase.cs +++ b/OpenSim/Framework/Servers/ServerBase.cs | |||
@@ -274,6 +274,12 @@ namespace OpenSim.Framework.Servers | |||
274 | "Set threadpool parameters. For debug purposes.", | 274 | "Set threadpool parameters. For debug purposes.", |
275 | HandleDebugThreadpoolSet); | 275 | HandleDebugThreadpoolSet); |
276 | 276 | ||
277 | m_console.Commands.AddCommand ( | ||
278 | "Debug", false, "debug threadpool status", | ||
279 | "debug threadpool status", | ||
280 | "Show current debug threadpool parameters.", | ||
281 | HandleDebugThreadpoolStatus); | ||
282 | |||
277 | m_console.Commands.AddCommand( | 283 | m_console.Commands.AddCommand( |
278 | "Debug", false, "force gc", | 284 | "Debug", false, "force gc", |
279 | "force gc", | 285 | "force gc", |
@@ -337,6 +343,23 @@ namespace OpenSim.Framework.Servers | |||
337 | Notice("serialosdreq is now {0}", setSerializeOsdRequests); | 343 | Notice("serialosdreq is now {0}", setSerializeOsdRequests); |
338 | } | 344 | } |
339 | 345 | ||
346 | private void HandleDebugThreadpoolStatus(string module, string[] args) | ||
347 | { | ||
348 | int workerThreads, iocpThreads; | ||
349 | |||
350 | ThreadPool.GetMinThreads(out workerThreads, out iocpThreads); | ||
351 | Notice("Min worker threads: {0}", workerThreads); | ||
352 | Notice("Min IOCP threads: {0}", iocpThreads); | ||
353 | |||
354 | ThreadPool.GetMaxThreads(out workerThreads, out iocpThreads); | ||
355 | Notice("Max worker threads: {0}", workerThreads); | ||
356 | Notice("Max IOCP threads: {0}", iocpThreads); | ||
357 | |||
358 | ThreadPool.GetAvailableThreads(out workerThreads, out iocpThreads); | ||
359 | Notice("Available worker threads: {0}", workerThreads); | ||
360 | Notice("Available IOCP threads: {0}", iocpThreads); | ||
361 | } | ||
362 | |||
340 | private void HandleDebugThreadpoolSet(string module, string[] args) | 363 | private void HandleDebugThreadpoolSet(string module, string[] args) |
341 | { | 364 | { |
342 | if (args.Length != 6) | 365 | if (args.Length != 6) |