From 7fdfeb58304d614970aa7c0010951ba5a8184e4b Mon Sep 17 00:00:00 2001 From: Teravus Ovares Date: Fri, 14 Dec 2007 00:49:40 +0000 Subject: * Added Active(physical) object count to the SimStatsReporter --- .../Region/Environment/Scenes/SimStatsReporter.cs | 24 +++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) (limited to 'OpenSim/Region/Environment/Scenes/SimStatsReporter.cs') diff --git a/OpenSim/Region/Environment/Scenes/SimStatsReporter.cs b/OpenSim/Region/Environment/Scenes/SimStatsReporter.cs index 9d9737a..15df619 100644 --- a/OpenSim/Region/Environment/Scenes/SimStatsReporter.cs +++ b/OpenSim/Region/Environment/Scenes/SimStatsReporter.cs @@ -21,6 +21,7 @@ namespace OpenSim.Region.Environment.Scenes PhysicsFPS = 2, AgentUpdates = 3, TotalPrim = 11, + ActivePrim = 12, Agents = 13, ChildAgents = 14, InPacketsPerSecond = 17, @@ -38,6 +39,7 @@ namespace OpenSim.Region.Environment.Scenes private int m_numPrim = 0; private int m_inPacketsPerSecond = 0; private int m_outPacketsPerSecond = 0; + private int m_activePrim = 0; private int m_unAckedBytes = 0; private RegionInfo ReportingRegion; @@ -57,7 +59,7 @@ namespace OpenSim.Region.Environment.Scenes { m_report.Enabled = false; SimStatsPacket statpack = new SimStatsPacket(); - SimStatsPacket.StatBlock[] sb = new SimStatsPacket.StatBlock[10]; + SimStatsPacket.StatBlock[] sb = new SimStatsPacket.StatBlock[11]; statpack.Region = new SimStatsPacket.RegionBlock(); statpack.Region.RegionX = ReportingRegion.RegionLocX; statpack.Region.RegionY = ReportingRegion.RegionLocY; @@ -100,16 +102,20 @@ namespace OpenSim.Region.Environment.Scenes sb[6].StatValue = m_numPrim; sb[7] = new SimStatsPacket.StatBlock(); - sb[7].StatID = (uint)Stats.InPacketsPerSecond; - sb[7].StatValue = (int)(m_inPacketsPerSecond / statsUpdatesEveryMS); + sb[7].StatID = (uint)Stats.ActivePrim; + sb[7].StatValue = m_activePrim; sb[8] = new SimStatsPacket.StatBlock(); - sb[8].StatID = (uint)Stats.OutPacketsPerSecond; - sb[8].StatValue = (int)(m_outPacketsPerSecond / statsUpdatesEveryMS); + sb[8].StatID = (uint)Stats.InPacketsPerSecond; + sb[8].StatValue = (int)(m_inPacketsPerSecond / statsUpdatesEveryMS); sb[9] = new SimStatsPacket.StatBlock(); - sb[9].StatID = (uint)Stats.UnAckedBytes; - sb[9].StatValue = (int) (m_unAckedBytes / statsUpdatesEveryMS); + sb[9].StatID = (uint)Stats.OutPacketsPerSecond; + sb[9].StatValue = (int)(m_outPacketsPerSecond / statsUpdatesEveryMS); + + sb[10] = new SimStatsPacket.StatBlock(); + sb[10].StatID = (uint)Stats.UnAckedBytes; + sb[10].StatValue = (int) (m_unAckedBytes / statsUpdatesEveryMS); statpack.Stat = sb; @@ -147,6 +153,10 @@ namespace OpenSim.Region.Environment.Scenes { m_numPrim = objects; } + public void SetActiveObjects(int objects) + { + m_activePrim = objects; + } public void AddFPS(int frames) { m_fps += frames; -- cgit v1.1