ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 00:46:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

performance counters are windows only, we are not, so .. gone

Browse Source
This commit is contained in:
UbitUmarov
2022-10-02 11:24:39 +01:00
parent 990831c373
commit fc3543c24a
2 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
OpenSim/Framework/Monitoring/ServerStatsCollector.cs
View File

@@ -35,7 +35,6 @@ using System.Threading;
using log4net;
using Nini.Config;
using OpenMetaverse.StructuredData;
using OpenSim.Framework;
namespace OpenSim.Framework.Monitoring
{
@@ -57,9 +56,9 @@ namespace OpenSim.Framework.Monitoring
public string NetworkInterfaceTypes = "Ethernet";
readonly int performanceCounterSampleInterval = 500;
// int lastperformanceCounterSampleTime = 0;
//readonly int performanceCounterSampleInterval = 500;
//int lastperformanceCounterSampleTime = 0;
/*
private class PerfCounterControl
{
public PerformanceCounter perfCounter;
@@ -78,6 +77,7 @@ namespace OpenSim.Framework.Monitoring
}
PerfCounterControl processorPercentPerfCounter = null;
*/
// IRegionModuleBase.Initialize
public void Initialise(IConfigSource source)
@@ -138,22 +138,22 @@ namespace OpenSim.Framework.Monitoring
public void RegisterServerStats()
{
// lastperformanceCounterSampleTime = Util.EnvironmentTickCount();
PerformanceCounter tempPC;
Stat tempStat;
string tempName;
//lastperformanceCounterSampleTime = Util.EnvironmentTickCount();
//PerformanceCounter tempPC;
//Stat tempStat;
//string tempName;
try
{
tempName = "CPUPercent";
tempPC = new PerformanceCounter("Processor", "% Processor Time", "_Total");
processorPercentPerfCounter = new PerfCounterControl(tempPC);
//tempName = "CPUPercent";
//tempPC = new PerformanceCounter("Processor", "% Processor Time", "_Total");
//processorPercentPerfCounter = new PerfCounterControl(tempPC);
// A long time bug in mono is that CPU percent is reported as CPU percent idle. Windows reports CPU percent busy.
tempStat = new Stat(tempName, tempName, "", "percent", CategoryServer, ContainerProcessor,
StatType.Pull, (s) => { GetNextValue(s, processorPercentPerfCounter); },
StatVerbosity.Info);
StatsManager.RegisterStat(tempStat);
RegisteredStats.Add(tempName, tempStat);
//tempStat = new Stat(tempName, tempName, "", "percent", CategoryServer, ContainerProcessor,
// StatType.Pull, (s) => { GetNextValue(s, processorPercentPerfCounter); },
// StatVerbosity.Info);
//StatsManager.RegisterStat(tempStat);
//RegisteredStats.Add(tempName, tempStat);
MakeStat("TotalProcessorTime", null, "sec", ContainerProcessor,
(s) => { s.Value = Math.Round(Process.GetCurrentProcess().TotalProcessorTime.TotalSeconds, 3); });
@@ -300,6 +300,7 @@ namespace OpenSim.Framework.Monitoring
});
}
/*
// Notes on performance counters:
// "How To Read Performance Counters": http://blogs.msdn.com/b/bclteam/archive/2006/06/02/618156.aspx
// "How to get the CPU Usage in C#": http://stackoverflow.com/questions/278071/how-to-get-the-cpu-usage-in-c
@@ -325,6 +326,7 @@ namespace OpenSim.Framework.Monitoring
}
}
}
*/
// Lookup the nic that goes with this stat and set the value by using a fetch action.
// Not sure about closure with delegates inside delegates.

12
OpenSim/Framework/Monitoring/Stats/Stat.cs
View File

@@ -27,10 +27,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using System.Text;
using log4net;
using OpenMetaverse.StructuredData;
namespace OpenSim.Framework.Monitoring
@@ -315,9 +312,9 @@ namespace OpenSim.Framework.Monitoring
lock (m_samples)
{
// m_log.DebugFormat(
// "[STAT]: Samples for {0} are {1}",
// Name, string.Join(",", m_samples.Select(s => s.ToString()).ToArray()));
//m_log.DebugFormat(
// "[STAT]: Samples for {0} are {1}",
// Name, string.Join(",", m_samples.Select(s => s.ToString()).ToArray()));
foreach (double s in m_samples)
{
@@ -331,8 +328,7 @@ namespace OpenSim.Framework.Monitoring
if (lastSample != null && penultimateSample != null)
{
lastChangeOverTime
= ((double)lastSample - (double)penultimateSample) / (Watchdog.WATCHDOG_INTERVAL_MS / 1000);
lastChangeOverTime = ((double)lastSample - (double)penultimateSample) / (Watchdog.WATCHDOG_INTERVAL_MS / 1000);
}
int divisor = m_samples.Count <= 1 ? 1 : m_samples.Count - 1;