OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Added Object count to sim stats (it's incorrect, however, it'll be fixed)

afrisby
Teravus Ovares 2007-12-12 14:07:26 +00:00
parent 6a4a10f0a1
commit 331db2336c
3 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Region/Environment/Scenes/InnerScene.cs
View File

@ -281,6 +281,12 @@ namespace OpenSim.Region.Environment.Scenes
{ {
return m_numRootAgents; return m_numRootAgents;
} }
public int GetTotalObjects()
{
return m_numPrim;
}
#endregion #endregion
#region Get Methods #region Get Methods

1
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@ -581,6 +581,7 @@ namespace OpenSim.Region.Environment.Scenes
m_statsReporter.AddInPackets(0); m_statsReporter.AddInPackets(0);
m_statsReporter.SetRootAgents(m_innerScene.GetRootAgentCount()); m_statsReporter.SetRootAgents(m_innerScene.GetRootAgentCount());
m_statsReporter.SetChildAgents(m_innerScene.GetChildAgentCount()); m_statsReporter.SetChildAgents(m_innerScene.GetChildAgentCount());
m_statsReporter.SetObjects(m_innerScene.GetTotalObjects());
} }
catch (NotImplementedException) catch (NotImplementedException)

24
OpenSim/Region/Environment/Scenes/SimStatsReporter.cs
View File

@ -20,6 +20,7 @@ namespace OpenSim.Region.Environment.Scenes
SimFPS = 1, SimFPS = 1,
PhysicsFPS = 2, PhysicsFPS = 2,
AgentUpdates = 3, AgentUpdates = 3,
TotalPrim = 11,
Agents = 13, Agents = 13,
ChildAgents = 14, ChildAgents = 14,
InPacketsPerSecond = 17, InPacketsPerSecond = 17,
@ -34,6 +35,7 @@ namespace OpenSim.Region.Environment.Scenes
private float m_agentUpdates = 0; private float m_agentUpdates = 0;
private int m_rootAgents = 0; private int m_rootAgents = 0;
private int m_childAgents = 0; private int m_childAgents = 0;
private int m_numPrim = 0;
private int m_inPacketsPerSecond = 0; private int m_inPacketsPerSecond = 0;
private int m_outPacketsPerSecond = 0; private int m_outPacketsPerSecond = 0;
private int m_unAckedBytes = 0; private int m_unAckedBytes = 0;
@ -55,7 +57,7 @@ namespace OpenSim.Region.Environment.Scenes
{ {
m_report.Enabled = false; m_report.Enabled = false;
SimStatsPacket statpack = new SimStatsPacket(); SimStatsPacket statpack = new SimStatsPacket();
SimStatsPacket.StatBlock[] sb = new SimStatsPacket.StatBlock[9]; SimStatsPacket.StatBlock[] sb = new SimStatsPacket.StatBlock[10];
statpack.Region = new SimStatsPacket.RegionBlock(); statpack.Region = new SimStatsPacket.RegionBlock();
statpack.Region.RegionX = ReportingRegion.RegionLocX; statpack.Region.RegionX = ReportingRegion.RegionLocX;
statpack.Region.RegionY = ReportingRegion.RegionLocY; statpack.Region.RegionY = ReportingRegion.RegionLocY;
@ -94,16 +96,20 @@ namespace OpenSim.Region.Environment.Scenes
sb[5].StatValue = m_childAgents; sb[5].StatValue = m_childAgents;
sb[6] = new SimStatsPacket.StatBlock(); sb[6] = new SimStatsPacket.StatBlock();
sb[6].StatID = (uint)Stats.InPacketsPerSecond; sb[6].StatID = (uint)Stats.TotalPrim;
sb[6].StatValue = (int)(m_inPacketsPerSecond / statsUpdatesEveryMS); sb[6].StatValue = m_numPrim;
sb[7] = new SimStatsPacket.StatBlock(); sb[7] = new SimStatsPacket.StatBlock();
sb[7].StatID = (uint)Stats.OutPacketsPerSecond; sb[7].StatID = (uint)Stats.InPacketsPerSecond;
sb[7].StatValue = (int)(m_outPacketsPerSecond / statsUpdatesEveryMS); sb[7].StatValue = (int)(m_inPacketsPerSecond / statsUpdatesEveryMS);
sb[8] = new SimStatsPacket.StatBlock(); sb[8] = new SimStatsPacket.StatBlock();
sb[8].StatID = (uint)Stats.UnAckedBytes; sb[8].StatID = (uint)Stats.OutPacketsPerSecond;
sb[8].StatValue = (int) (m_unAckedBytes / statsUpdatesEveryMS); sb[8].StatValue = (int)(m_outPacketsPerSecond / statsUpdatesEveryMS);
sb[9] = new SimStatsPacket.StatBlock();
sb[9].StatID = (uint)Stats.UnAckedBytes;
sb[9].StatValue = (int) (m_unAckedBytes / statsUpdatesEveryMS);
statpack.Stat = sb; statpack.Stat = sb;
@ -137,6 +143,10 @@ namespace OpenSim.Region.Environment.Scenes
{ {
m_childAgents = childAgents; m_childAgents = childAgents;
} }
public void SetObjects(int objects)
{
m_numPrim = objects;
}
public void AddFPS(int frames) public void AddFPS(int frames)
{ {
m_fps += frames; m_fps += frames;