From 200dcee1b7fa799936aaf43a18a34bfbf8b94449 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 21 Jul 2014 22:51:11 +0100
Subject: Fix CPU processor use reporting on Mono.

Despite the comments in the code, it appears that the issue where the .NET performance counter was wrongly idle time time on Mono was fixed in 2009.
https://bugzilla.novell.com/show_bug.cgi?id=468625
Which means that the workaround is no longer necessary and produces bad results instead.
---
 OpenSim/Framework/Monitoring/ServerStatsCollector.cs | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

(limited to 'OpenSim/Framework')

diff --git a/OpenSim/Framework/Monitoring/ServerStatsCollector.cs b/OpenSim/Framework/Monitoring/ServerStatsCollector.cs
index ac0f0bc..b4e0b16 100644
--- a/OpenSim/Framework/Monitoring/ServerStatsCollector.cs
+++ b/OpenSim/Framework/Monitoring/ServerStatsCollector.cs
@@ -141,7 +141,7 @@ namespace OpenSim.Framework.Monitoring
                 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, Util.IsWindows() ? 1 : -1); },
+                                StatType.Pull, (s) => { GetNextValue(s, processorPercentPerfCounter); },
                                 StatVerbosity.Info);
                 StatsManager.RegisterStat(tempStat);
                 RegisteredStats.Add(tempName, tempStat);
@@ -253,28 +253,22 @@ namespace OpenSim.Framework.Monitoring
         //  "How to get the CPU Usage in C#": http://stackoverflow.com/questions/278071/how-to-get-the-cpu-usage-in-c
         //  "Mono Performance Counters": http://www.mono-project.com/Mono_Performance_Counters
         private delegate double PerfCounterNextValue();
+
         private void GetNextValue(Stat stat, PerfCounterControl perfControl)
         {
-            GetNextValue(stat, perfControl, 1.0);
-        }
-        private void GetNextValue(Stat stat, PerfCounterControl perfControl, double factor)
-        {
             if (Util.EnvironmentTickCountSubtract(perfControl.lastFetch) > performanceCounterSampleInterval)
             {
                 if (perfControl != null && perfControl.perfCounter != null)
                 {
                     try
                     {
-                        // Kludge for factor to run double duty. If -1, subtract the value from one
-                        if (factor == -1)
-                            stat.Value = 1 - perfControl.perfCounter.NextValue();
-                        else
-                            stat.Value = perfControl.perfCounter.NextValue() / factor;
+                        stat.Value = perfControl.perfCounter.NextValue();
                     }
                     catch (Exception e)
                     {
                         m_log.ErrorFormat("{0} Exception on NextValue fetching {1}: {2}", LogHeader, stat.Name, e);
                     }
+
                     perfControl.lastFetch = Util.EnvironmentTickCount();
                 }
             }
-- 
cgit v1.1