diff options
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs | 2 | ||||
-rwxr-xr-x | OpenSim/Region/Framework/Scenes/SimStatsReporter.cs | 21 |
2 files changed, 13 insertions, 10 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs b/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs index ae1fc60..93a7cf2 100644 --- a/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs +++ b/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs | |||
@@ -301,7 +301,7 @@ namespace OpenSim.Region.CoreModules.Framework.Monitoring | |||
301 | m_scene, | 301 | m_scene, |
302 | "SpareFrameTimeMonitor", | 302 | "SpareFrameTimeMonitor", |
303 | "Spare Frame Time", | 303 | "Spare Frame Time", |
304 | m => m.Scene.StatsReporter.LastReportedSimStats[37], | 304 | m => m.Scene.StatsReporter.LastReportedSimStats[38], |
305 | m => string.Format("{0} ms", m.GetValue()))); | 305 | m => string.Format("{0} ms", m.GetValue()))); |
306 | 306 | ||
307 | m_alerts.Add(new DeadlockAlert(m_staticMonitors.Find(x => x is LastFrameTimeMonitor) as LastFrameTimeMonitor)); | 307 | m_alerts.Add(new DeadlockAlert(m_staticMonitors.Find(x => x is LastFrameTimeMonitor) as LastFrameTimeMonitor)); |
diff --git a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs index 462e8a6..b4beff9 100755 --- a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs +++ b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs | |||
@@ -63,7 +63,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
63 | 63 | ||
64 | // Determines the size of the array that is used to collect StatBlocks | 64 | // Determines the size of the array that is used to collect StatBlocks |
65 | // for sending viewer compatible stats must be conform with sb array filling below | 65 | // for sending viewer compatible stats must be conform with sb array filling below |
66 | private const int m_statisticViewerArraySize = 37; | 66 | private const int m_statisticViewerArraySize = 38; |
67 | // size of LastReportedSimFPS with extra stats. | 67 | // size of LastReportedSimFPS with extra stats. |
68 | private const int m_statisticExtraArraySize = (int)(Stats.SimExtraCountEnd - Stats.SimExtraCountStart); | 68 | private const int m_statisticExtraArraySize = (int)(Stats.SimExtraCountEnd - Stats.SimExtraCountStart); |
69 | 69 | ||
@@ -523,8 +523,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
523 | sb[36].StatID = (uint)Stats.SimPhysicsMemory; | 523 | sb[36].StatID = (uint)Stats.SimPhysicsMemory; |
524 | sb[36].StatValue = 0; | 524 | sb[36].StatValue = 0; |
525 | 525 | ||
526 | 526 | sb[37].StatID = (uint)Stats.ScriptMS; | |
527 | for (int i = 0; i < 37; i++) | 527 | sb[37].StatValue = 0; |
528 | |||
529 | |||
530 | for (int i = 0; i < m_statisticViewerArraySize; i++) | ||
528 | { | 531 | { |
529 | lastReportedSimStats[i] = sb[i].StatValue; | 532 | lastReportedSimStats[i] = sb[i].StatValue; |
530 | } | 533 | } |
@@ -539,27 +542,27 @@ namespace OpenSim.Region.Framework.Scenes | |||
539 | 542 | ||
540 | sbex[0].StatID = (uint)Stats.LSLScriptLinesPerSecond; | 543 | sbex[0].StatID = (uint)Stats.LSLScriptLinesPerSecond; |
541 | sbex[0].StatValue = m_scriptLinesPerSecond * updateFactor; | 544 | sbex[0].StatValue = m_scriptLinesPerSecond * updateFactor; |
542 | lastReportedSimStats[37] = m_scriptLinesPerSecond * updateFactor; | 545 | lastReportedSimStats[38] = m_scriptLinesPerSecond * updateFactor; |
543 | 546 | ||
544 | sbex[1].StatID = (uint)Stats.FrameDilation2; | 547 | sbex[1].StatID = (uint)Stats.FrameDilation2; |
545 | sbex[1].StatValue = (Single.IsNaN(m_timeDilation)) ? 0.1f : m_timeDilation; | 548 | sbex[1].StatValue = (Single.IsNaN(m_timeDilation)) ? 0.1f : m_timeDilation; |
546 | lastReportedSimStats[38] = (Single.IsNaN(m_timeDilation)) ? 0.1f : m_timeDilation; | 549 | lastReportedSimStats[39] = (Single.IsNaN(m_timeDilation)) ? 0.1f : m_timeDilation; |
547 | 550 | ||
548 | sbex[2].StatID = (uint)Stats.UsersLoggingIn; | 551 | sbex[2].StatID = (uint)Stats.UsersLoggingIn; |
549 | sbex[2].StatValue = m_usersLoggingIn; | 552 | sbex[2].StatValue = m_usersLoggingIn; |
550 | lastReportedSimStats[39] = m_usersLoggingIn; | 553 | lastReportedSimStats[40] = m_usersLoggingIn; |
551 | 554 | ||
552 | sbex[3].StatID = (uint)Stats.TotalGeoPrim; | 555 | sbex[3].StatID = (uint)Stats.TotalGeoPrim; |
553 | sbex[3].StatValue = m_numGeoPrim; | 556 | sbex[3].StatValue = m_numGeoPrim; |
554 | lastReportedSimStats[40] = m_numGeoPrim; | 557 | lastReportedSimStats[41] = m_numGeoPrim; |
555 | 558 | ||
556 | sbex[4].StatID = (uint)Stats.TotalMesh; | 559 | sbex[4].StatID = (uint)Stats.TotalMesh; |
557 | sbex[4].StatValue = m_numMesh; | 560 | sbex[4].StatValue = m_numMesh; |
558 | lastReportedSimStats[41] = m_numMesh; | 561 | lastReportedSimStats[42] = m_numMesh; |
559 | 562 | ||
560 | sbex[5].StatID = (uint)Stats.ThreadCount; | 563 | sbex[5].StatID = (uint)Stats.ThreadCount; |
561 | sbex[5].StatValue = m_inUseThreads; | 564 | sbex[5].StatValue = m_inUseThreads; |
562 | lastReportedSimStats[42] = m_inUseThreads; | 565 | lastReportedSimStats[43] = m_inUseThreads; |
563 | 566 | ||
564 | SimStats simStats | 567 | SimStats simStats |
565 | = new SimStats( | 568 | = new SimStats( |