From b019b20eb89aab60df1a1a5c47b5b5cc4aebc4d9 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Tue, 24 Apr 2012 03:05:29 +0100 Subject: *testing* changed stats time reports to be per reported frame and not acumulated in about 1second. Total Frame Time is not just 1/reported sim fps --- .../Region/Framework/Scenes/SimStatsReporter.cs | 75 ++++++++++++++++++---- 1 file changed, 64 insertions(+), 11 deletions(-) (limited to 'OpenSim/Region') diff --git a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs index 5c56264..31f5b88 100644 --- a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs +++ b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs @@ -75,7 +75,20 @@ namespace OpenSim.Region.Framework.Scenes OutPacketsPerSecond = 18, PendingDownloads = 19, PendingUploads = 20, + VirtualSizeKB = 21, + ResidentSizeKB = 22, + PendingLocalUploads = 23, UnAckedBytes = 24, + PhysicsPinnedTasks = 25, + PhysicsLODTasks = 26, + PhysicsStepMS = 27, + PhysicsShapeMS = 28, + PhysicsOtherMS = 29, + PhysicsMemory = 30, + ScriptEPS = 31, + SimSpareTime = 32, + SimSleepTime = 33, + IOPumpTime = 34 } /// @@ -123,7 +136,7 @@ namespace OpenSim.Region.Framework.Scenes // saved last reported value so there is something available for llGetRegionFPS private float lastReportedSimFPS = 0; - private float[] lastReportedSimStats = new float[21]; + private float[] lastReportedSimStats = new float[23]; private float m_pfps = 0; /// @@ -142,6 +155,8 @@ namespace OpenSim.Region.Framework.Scenes private int m_physicsMS = 0; private int m_imageMS = 0; private int m_otherMS = 0; + private int m_sleeptimeMS = 0; + //Ckrinke: (3-21-08) Comment out to remove a compiler warning. Bring back into play when needed. //Ckrinke private int m_scriptMS = 0; @@ -200,7 +215,7 @@ namespace OpenSim.Region.Framework.Scenes private void statsHeartBeat(object sender, EventArgs e) { - SimStatsPacket.StatBlock[] sb = new SimStatsPacket.StatBlock[21]; + SimStatsPacket.StatBlock[] sb = new SimStatsPacket.StatBlock[23]; SimStatsPacket.RegionBlock rb = new SimStatsPacket.RegionBlock(); // Know what's not thread safe in Mono... modifying timers. @@ -249,7 +264,26 @@ namespace OpenSim.Region.Framework.Scenes // 'statsUpdateFactor' is how often stats packets are sent in seconds. Used below to change // values to X-per-second values. - for (int i = 0; i < 21; i++) + float factor = 1 / statsUpdateFactor; + if (reportedFPS <= 0) + reportedFPS = 1; + float TotalFrameTime = 1000.0f * statsUpdateFactor / (float)reportedFPS; + float perframe = 1.0f / (float)reportedFPS; + + float sparetime; + if (m_nominalReportedFps <= 0) + sparetime = 0; + else + { + sparetime = 1000.0f / (float)m_nominalReportedFps; + sparetime -= m_frameMS * perframe; + if (sparetime < 0) + sparetime = 0; + else if (sparetime > TotalFrameTime) + sparetime = TotalFrameTime; + } + + for (int i = 0; i < 23; i++) { sb[i] = new SimStatsPacket.StatBlock(); } @@ -279,19 +313,25 @@ namespace OpenSim.Region.Framework.Scenes sb[7].StatValue = m_activePrim; sb[8].StatID = (uint)Stats.FrameMS; - sb[8].StatValue = m_frameMS / statsUpdateFactor; + // sb[8].StatValue = m_frameMS / statsUpdateFactor; + sb[8].StatValue = TotalFrameTime; sb[9].StatID = (uint)Stats.NetMS; - sb[9].StatValue = m_netMS / statsUpdateFactor; + // sb[9].StatValue = m_netMS / statsUpdateFactor; + sb[9].StatValue = m_netMS * perframe; sb[10].StatID = (uint)Stats.PhysicsMS; - sb[10].StatValue = m_physicsMS / statsUpdateFactor; + // sb[10].StatValue = m_physicsMS / statsUpdateFactor; + sb[10].StatValue = m_physicsMS * perframe; sb[11].StatID = (uint)Stats.ImageMS ; - sb[11].StatValue = m_imageMS / statsUpdateFactor; + // sb[11].StatValue = m_imageMS / statsUpdateFactor; + sb[11].StatValue = m_imageMS * perframe; sb[12].StatID = (uint)Stats.OtherMS; - sb[12].StatValue = m_otherMS / statsUpdateFactor; + // sb[12].StatValue = m_otherMS / statsUpdateFactor; + sb[12].StatValue = m_otherMS * perframe; + sb[13].StatID = (uint)Stats.InPacketsPerSecond; sb[13].StatValue = (m_inPacketsPerSecond / statsUpdateFactor); @@ -303,7 +343,8 @@ namespace OpenSim.Region.Framework.Scenes sb[15].StatValue = m_unAckedBytes; sb[16].StatID = (uint)Stats.AgentMS; - sb[16].StatValue = m_agentMS / statsUpdateFactor; +// sb[16].StatValue = m_agentMS / statsUpdateFactor; + sb[16].StatValue = m_agentMS * perframe; sb[17].StatID = (uint)Stats.PendingDownloads; sb[17].StatValue = m_pendingDownloads; @@ -316,8 +357,14 @@ namespace OpenSim.Region.Framework.Scenes sb[20].StatID = (uint)Stats.ScriptLinesPerSecond; sb[20].StatValue = m_scriptLinesPerSecond / statsUpdateFactor; - - for (int i = 0; i < 21; i++) + + sb[21].StatID = (uint)Stats.SimSpareTime; + sb[21].StatValue = sparetime; + + sb[22].StatID = (uint)Stats.SimSleepTime; + sb[22].StatValue = m_sleeptimeMS * perframe; + + for (int i = 0; i < 23; i++) { lastReportedSimStats[i] = sb[i].StatValue; } @@ -358,6 +405,7 @@ namespace OpenSim.Region.Framework.Scenes m_physicsMS = 0; m_imageMS = 0; m_otherMS = 0; + m_sleeptimeMS = 0; //Ckrinke This variable is not used, so comment to remove compiler warning until it is used. //Ckrinke m_scriptMS = 0; @@ -484,6 +532,11 @@ namespace OpenSim.Region.Framework.Scenes m_otherMS += ms; } + public void addSleepMS(int ms) + { + m_sleeptimeMS += ms; + } + public void AddPendingDownloads(int count) { m_pendingDownloads += count; -- cgit v1.1