diff options
-rwxr-xr-x | OpenSim/Region/Framework/Scenes/Scene.cs | 1 | ||||
-rwxr-xr-x | OpenSim/Region/Framework/Scenes/SimStatsReporter.cs | 11 |
2 files changed, 10 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 52e03b2..1b26cc3 100755 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -1938,6 +1938,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1938 | /// <param name="ticks">Elapsed Stopwatch ticks</param> | 1938 | /// <param name="ticks">Elapsed Stopwatch ticks</param> |
1939 | public void AddScriptExecutionTime(long ticks) | 1939 | public void AddScriptExecutionTime(long ticks) |
1940 | { | 1940 | { |
1941 | StatsReporter.addScriptEvents(1); | ||
1941 | Interlocked.Add(ref m_scriptExecutionTime, ticks); | 1942 | Interlocked.Add(ref m_scriptExecutionTime, ticks); |
1942 | } | 1943 | } |
1943 | 1944 | ||
diff --git a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs index 66cf14f..de3c3d6 100755 --- a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs +++ b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs | |||
@@ -230,6 +230,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
230 | private int m_pendingUploads = 0; // FIXME: Not currently filled in | 230 | private int m_pendingUploads = 0; // FIXME: Not currently filled in |
231 | private int m_activeScripts; | 231 | private int m_activeScripts; |
232 | private int m_scriptLinesPerSecond; | 232 | private int m_scriptLinesPerSecond; |
233 | private int m_scriptEventsPerSecond; | ||
233 | 234 | ||
234 | private int m_objectCapacity = 45000; | 235 | private int m_objectCapacity = 45000; |
235 | 236 | ||
@@ -496,8 +497,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
496 | sb[27].StatID = (uint)Stats.PhysicsLodTasks; | 497 | sb[27].StatID = (uint)Stats.PhysicsLodTasks; |
497 | sb[27].StatValue = 0; | 498 | sb[27].StatValue = 0; |
498 | 499 | ||
499 | sb[28].StatID = (uint)Stats.ScriptEps; // we should have this | 500 | sb[28].StatID = (uint)Stats.ScriptEps; // we actuall have this, but not messing array order AGAIN |
500 | sb[28].StatValue = 0; | 501 | sb[28].StatValue = m_scriptEventsPerSecond * updateFactor; |
501 | 502 | ||
502 | sb[29].StatID = (uint)Stats.SimAIStepTimeMS; | 503 | sb[29].StatID = (uint)Stats.SimAIStepTimeMS; |
503 | sb[29].StatValue = 0; | 504 | sb[29].StatValue = 0; |
@@ -620,6 +621,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
620 | //m_outPacketsPerSecond = 0; | 621 | //m_outPacketsPerSecond = 0; |
621 | m_unAckedBytes = 0; | 622 | m_unAckedBytes = 0; |
622 | m_scriptLinesPerSecond = 0; | 623 | m_scriptLinesPerSecond = 0; |
624 | m_scriptEventsPerSecond = 0; | ||
623 | 625 | ||
624 | m_frameMS = 0; | 626 | m_frameMS = 0; |
625 | m_agentMS = 0; | 627 | m_agentMS = 0; |
@@ -756,6 +758,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
756 | m_scriptLinesPerSecond += count; | 758 | m_scriptLinesPerSecond += count; |
757 | } | 759 | } |
758 | 760 | ||
761 | public void addScriptEvents(int count) | ||
762 | { | ||
763 | m_scriptEventsPerSecond += count; | ||
764 | } | ||
765 | |||
759 | public void AddPacketsStats(int inPackets, int outPackets, int unAckedBytes) | 766 | public void AddPacketsStats(int inPackets, int outPackets, int unAckedBytes) |
760 | { | 767 | { |
761 | AddInPackets(inPackets); | 768 | AddInPackets(inPackets); |