diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs b/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs index 64feec1..fb3d31c 100644 --- a/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs +++ b/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs | |||
@@ -44,7 +44,7 @@ using Mono.Addins; | |||
44 | namespace OpenSim.Region.CoreModules.Framework.Monitoring | 44 | namespace OpenSim.Region.CoreModules.Framework.Monitoring |
45 | { | 45 | { |
46 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "MonitorModule")] | 46 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "MonitorModule")] |
47 | public class MonitorModule : INonSharedRegionModule | 47 | public class MonitorModule : INonSharedRegionModule |
48 | { | 48 | { |
49 | /// <summary> | 49 | /// <summary> |
50 | /// Is this module enabled? | 50 | /// Is this module enabled? |
@@ -78,7 +78,7 @@ namespace OpenSim.Region.CoreModules.Framework.Monitoring | |||
78 | 78 | ||
79 | if (cnfg != null) | 79 | if (cnfg != null) |
80 | Enabled = cnfg.GetBoolean("Enabled", true); | 80 | Enabled = cnfg.GetBoolean("Enabled", true); |
81 | 81 | ||
82 | if (!Enabled) | 82 | if (!Enabled) |
83 | return; | 83 | return; |
84 | 84 | ||
@@ -205,7 +205,7 @@ namespace OpenSim.Region.CoreModules.Framework.Monitoring | |||
205 | m_scene, | 205 | m_scene, |
206 | "ScriptEventsPerSecondMonitor", | 206 | "ScriptEventsPerSecondMonitor", |
207 | "Script Events", | 207 | "Script Events", |
208 | m => m.Scene.StatsReporter.LastReportedSimStats[20], | 208 | m => m.Scene.StatsReporter.LastReportedSimStats[23], |
209 | m => string.Format("{0} per second", m.GetValue()))); | 209 | m => string.Format("{0} per second", m.GetValue()))); |
210 | 210 | ||
211 | m_staticMonitors.Add( | 211 | m_staticMonitors.Add( |
@@ -301,7 +301,7 @@ namespace OpenSim.Region.CoreModules.Framework.Monitoring | |||
301 | m_scene, | 301 | m_scene, |
302 | "SpareFrameTimeMonitor", | 302 | "SpareFrameTimeMonitor", |
303 | "Spare Frame Time", | 303 | "Spare Frame Time", |
304 | m => m.Scene.StatsReporter.LastReportedSimStats[21], | 304 | m => m.Scene.StatsReporter.LastReportedSimStats[38], |
305 | m => string.Format("{0} ms", m.GetValue()))); | 305 | m => string.Format("{0} ms", m.GetValue()))); |
306 | 306 | ||
307 | m_alerts.Add(new DeadlockAlert(m_staticMonitors.Find(x => x is LastFrameTimeMonitor) as LastFrameTimeMonitor)); | 307 | m_alerts.Add(new DeadlockAlert(m_staticMonitors.Find(x => x is LastFrameTimeMonitor) as LastFrameTimeMonitor)); |
@@ -433,7 +433,7 @@ namespace OpenSim.Region.CoreModules.Framework.Monitoring | |||
433 | MakeStat("ScriptLines", "lines/sec", (s) => { s.Value = m_scene.StatsReporter.LastReportedSimStats[20]; }); | 433 | MakeStat("ScriptLines", "lines/sec", (s) => { s.Value = m_scene.StatsReporter.LastReportedSimStats[20]; }); |
434 | MakeStat("SimSpareMS", "ms/sec", (s) => { s.Value = m_scene.StatsReporter.LastReportedSimStats[21]; }); | 434 | MakeStat("SimSpareMS", "ms/sec", (s) => { s.Value = m_scene.StatsReporter.LastReportedSimStats[21]; }); |
435 | } | 435 | } |
436 | 436 | ||
437 | private void UnRegisterStatsManagerRegionStatistics() | 437 | private void UnRegisterStatsManagerRegionStatistics() |
438 | { | 438 | { |
439 | foreach (Stat stat in registeredStats) | 439 | foreach (Stat stat in registeredStats) |
@@ -443,6 +443,6 @@ namespace OpenSim.Region.CoreModules.Framework.Monitoring | |||
443 | } | 443 | } |
444 | registeredStats.Clear(); | 444 | registeredStats.Clear(); |
445 | } | 445 | } |
446 | 446 | ||
447 | } | 447 | } |
448 | } \ No newline at end of file | 448 | } \ No newline at end of file |