diff options
author | Adam Frisby | 2009-11-02 00:05:49 +1100 |
---|---|---|
committer | Adam Frisby | 2009-11-02 00:05:49 +1100 |
commit | 838bc80ab9273c2834794535886a86c7574bb0d3 (patch) | |
tree | 4d352d926fdc8ebfe6e823bbe4ff9eebcc98efed /OpenSim/Region/CoreModules/Framework | |
parent | * Implements new 'Monitoring' system for reporting performance. (diff) | |
download | opensim-SC_OLD-838bc80ab9273c2834794535886a86c7574bb0d3.zip opensim-SC_OLD-838bc80ab9273c2834794535886a86c7574bb0d3.tar.gz opensim-SC_OLD-838bc80ab9273c2834794535886a86c7574bb0d3.tar.bz2 opensim-SC_OLD-838bc80ab9273c2834794535886a86c7574bb0d3.tar.xz |
* Implemented some tweaks to monitoring module.
* Output is prettier & more useful.
* Added 'Alerts' to allow rules to be constructed using Monitors to detect for events such as deadlocks. This will be translated to SNMP Traps when I get SNMP implemented.
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework')
3 files changed, 95 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/Monitoring/Alerts/DeadlockAlert.cs b/OpenSim/Region/CoreModules/Framework/Monitoring/Alerts/DeadlockAlert.cs new file mode 100644 index 0000000..b546ccb --- /dev/null +++ b/OpenSim/Region/CoreModules/Framework/Monitoring/Alerts/DeadlockAlert.cs | |||
@@ -0,0 +1,37 @@ | |||
1 | using OpenSim.Region.CoreModules.Framework.Monitoring.Monitors; | ||
2 | |||
3 | namespace OpenSim.Region.CoreModules.Framework.Monitoring.Alerts | ||
4 | { | ||
5 | class DeadlockAlert : IAlert | ||
6 | { | ||
7 | private LastFrameTimeMonitor m_monitor; | ||
8 | |||
9 | public DeadlockAlert(LastFrameTimeMonitor m_monitor) | ||
10 | { | ||
11 | this.m_monitor = m_monitor; | ||
12 | } | ||
13 | |||
14 | #region Implementation of IAlert | ||
15 | |||
16 | public string GetName() | ||
17 | { | ||
18 | return "Potential Deadlock Alert"; | ||
19 | } | ||
20 | |||
21 | public void Test() | ||
22 | { | ||
23 | if (m_monitor.GetValue() > 60 * 1000) | ||
24 | { | ||
25 | if(OnTriggerAlert != null) | ||
26 | { | ||
27 | OnTriggerAlert(typeof (DeadlockAlert), | ||
28 | (int) (m_monitor.GetValue()/1000) + " second(s) since last frame processed.", true); | ||
29 | } | ||
30 | } | ||
31 | } | ||
32 | |||
33 | public event Alert OnTriggerAlert; | ||
34 | |||
35 | #endregion | ||
36 | } | ||
37 | } | ||
diff --git a/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs b/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs index d4a7692..769af8d 100644 --- a/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs +++ b/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs | |||
@@ -2,6 +2,7 @@ | |||
2 | using System.Reflection; | 2 | using System.Reflection; |
3 | using log4net; | 3 | using log4net; |
4 | using Nini.Config; | 4 | using Nini.Config; |
5 | using OpenSim.Region.CoreModules.Framework.Monitoring.Alerts; | ||
5 | using OpenSim.Region.CoreModules.Framework.Monitoring.Monitors; | 6 | using OpenSim.Region.CoreModules.Framework.Monitoring.Monitors; |
6 | using OpenSim.Region.Framework.Interfaces; | 7 | using OpenSim.Region.Framework.Interfaces; |
7 | using OpenSim.Region.Framework.Scenes; | 8 | using OpenSim.Region.Framework.Scenes; |
@@ -12,13 +13,22 @@ namespace OpenSim.Region.CoreModules.Framework.Monitoring | |||
12 | { | 13 | { |
13 | private Scene m_scene; | 14 | private Scene m_scene; |
14 | private readonly List<IMonitor> m_monitors = new List<IMonitor>(); | 15 | private readonly List<IMonitor> m_monitors = new List<IMonitor>(); |
16 | private readonly List<IAlert> m_alerts = new List<IAlert>(); | ||
15 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 17 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
16 | 18 | ||
17 | public void DebugMonitors(string module, string[] args) | 19 | public void DebugMonitors(string module, string[] args) |
18 | { | 20 | { |
19 | foreach (IMonitor monitor in m_monitors) | 21 | foreach (IMonitor monitor in m_monitors) |
20 | { | 22 | { |
21 | m_log.Info("[MonitorModule] " + m_scene.RegionInfo.RegionName + " reports " + monitor.GetName() + " = " + monitor.GetValue()); | 23 | m_log.Info("[MonitorModule] " + m_scene.RegionInfo.RegionName + " reports " + monitor.GetName() + " = " + monitor.GetFriendlyValue()); |
24 | } | ||
25 | } | ||
26 | |||
27 | public void TestAlerts() | ||
28 | { | ||
29 | foreach (IAlert alert in m_alerts) | ||
30 | { | ||
31 | alert.Test(); | ||
22 | } | 32 | } |
23 | } | 33 | } |
24 | 34 | ||
@@ -48,6 +58,19 @@ namespace OpenSim.Region.CoreModules.Framework.Monitoring | |||
48 | m_monitors.Add(new TotalFrameMonitor(m_scene)); | 58 | m_monitors.Add(new TotalFrameMonitor(m_scene)); |
49 | m_monitors.Add(new EventFrameMonitor(m_scene)); | 59 | m_monitors.Add(new EventFrameMonitor(m_scene)); |
50 | m_monitors.Add(new LandFrameMonitor(m_scene)); | 60 | m_monitors.Add(new LandFrameMonitor(m_scene)); |
61 | m_monitors.Add(new LastFrameTimeMonitor(m_scene)); | ||
62 | |||
63 | m_alerts.Add(new DeadlockAlert(m_monitors.Find(x => x is LastFrameTimeMonitor) as LastFrameTimeMonitor)); | ||
64 | |||
65 | foreach (IAlert alert in m_alerts) | ||
66 | { | ||
67 | alert.OnTriggerAlert += OnTriggerAlert; | ||
68 | } | ||
69 | } | ||
70 | |||
71 | void OnTriggerAlert(System.Type reporter, string reason, bool fatal) | ||
72 | { | ||
73 | m_log.Error("[Monitor] " + reporter.Name + " for " + m_scene.RegionInfo.RegionName + " reports " + reason + " (Fatal: " + fatal + ")"); | ||
51 | } | 74 | } |
52 | 75 | ||
53 | public void Close() | 76 | public void Close() |
diff --git a/OpenSim/Region/CoreModules/Framework/Monitoring/Monitors/LastFrameTimeMonitor.cs b/OpenSim/Region/CoreModules/Framework/Monitoring/Monitors/LastFrameTimeMonitor.cs new file mode 100644 index 0000000..36363f8 --- /dev/null +++ b/OpenSim/Region/CoreModules/Framework/Monitoring/Monitors/LastFrameTimeMonitor.cs | |||
@@ -0,0 +1,34 @@ | |||
1 | using System; | ||
2 | using OpenSim.Region.Framework.Scenes; | ||
3 | |||
4 | namespace OpenSim.Region.CoreModules.Framework.Monitoring.Monitors | ||
5 | { | ||
6 | class LastFrameTimeMonitor : IMonitor | ||
7 | { | ||
8 | private readonly Scene m_scene; | ||
9 | |||
10 | public LastFrameTimeMonitor(Scene scene) | ||
11 | { | ||
12 | m_scene = scene; | ||
13 | } | ||
14 | |||
15 | #region Implementation of IMonitor | ||
16 | |||
17 | public double GetValue() | ||
18 | { | ||
19 | return Environment.TickCount - m_scene.MonitorLastFrameTick; | ||
20 | } | ||
21 | |||
22 | public string GetName() | ||
23 | { | ||
24 | return "Last Completed Frame At"; | ||
25 | } | ||
26 | |||
27 | public string GetFriendlyValue() | ||
28 | { | ||
29 | return (int)GetValue() + "ms ago"; | ||
30 | } | ||
31 | |||
32 | #endregion | ||
33 | } | ||
34 | } | ||