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/Framework/Scenes | |
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/Framework/Scenes')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 07fdc9f..1e7803f 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -279,6 +279,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
279 | private int backupMS; | 279 | private int backupMS; |
280 | private int terrainMS; | 280 | private int terrainMS; |
281 | private int landMS; | 281 | private int landMS; |
282 | private int lastCompletedFrame; | ||
282 | 283 | ||
283 | public int MonitorFrameTime { get { return frameMS; } } | 284 | public int MonitorFrameTime { get { return frameMS; } } |
284 | public int MonitorPhysicsUpdateTime { get { return physicsMS; } } | 285 | public int MonitorPhysicsUpdateTime { get { return physicsMS; } } |
@@ -289,6 +290,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
289 | public int MonitorBackupTime { get { return backupMS; } } | 290 | public int MonitorBackupTime { get { return backupMS; } } |
290 | public int MonitorTerrainTime { get { return terrainMS; } } | 291 | public int MonitorTerrainTime { get { return terrainMS; } } |
291 | public int MonitorLandTime { get { return landMS; } } | 292 | public int MonitorLandTime { get { return landMS; } } |
293 | public int MonitorLastFrameTick { get { return lastCompletedFrame; } } | ||
292 | 294 | ||
293 | private bool m_physics_enabled = true; | 295 | private bool m_physics_enabled = true; |
294 | private bool m_scripts_enabled = true; | 296 | private bool m_scripts_enabled = true; |
@@ -1129,6 +1131,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1129 | otherMS = tickCount - otherMS; | 1131 | otherMS = tickCount - otherMS; |
1130 | tmpFrameMS -= tickCount; | 1132 | tmpFrameMS -= tickCount; |
1131 | frameMS = tmpFrameMS; | 1133 | frameMS = tmpFrameMS; |
1134 | lastCompletedFrame = tickCount; | ||
1132 | 1135 | ||
1133 | // if (m_frame%m_update_avatars == 0) | 1136 | // if (m_frame%m_update_avatars == 0) |
1134 | // UpdateInWorldTime(); | 1137 | // UpdateInWorldTime(); |