Changeset 124 for trunk/MacFaceLibrary/CPUStatisticsNtQuerySystemInformation.cs

Timestamp:

May 26, 2009, 3:31:47 AM (15 years ago)

Author:

rryu

Message:

• MacFace::NtKernel?.QuerySystemProcessorPerformanceInfomation?()で複数のCPUの使用率を取得できるようにした
• CPU使用率の計算が間違っていたのを修正

File:

• trunk/MacFaceLibrary/CPUStatisticsNtQuerySystemInformation.cs (modified) (4 diffs)

trunk/MacFaceLibrary/CPUStatisticsNtQuerySystemInformation.cs

@@ +1 @@
+// $Id$
 using System;
 using System.Diagnostics;
@@ -11 +12 @@
         {
                         
-                UInt64 idleTimePrev = 0;
-                UInt64 kernelTimePrev = 0;
-                UInt64 userTimePrev = 0;
+                Int64 idleTimePrev = 0;
+                Int64 kernelTimePrev = 0;
+                Int64 userTimePrev = 0;
 
                 public CPUStatisticsNtQuerySystemInformation(int historySize) : base(historySize)
@@ -22 +23 @@
                 protected override CPUUsage NextValue()
                 {
-                        UInt64 idleTime;
-                        UInt64 kernelTime;
-                        UInt64 userTime;
+                        Int64 idleTime;
+                        Int64 kernelTime;
+                        Int64 userTime;
 
-                        NtKernel.SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION sysProcessorPerfInfo = NtKernel.QuerySystemProcessorPerformanceInfomation();
+                        NtKernel.SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION sysProcessorPerfInfo = NtKernel.QuerySystemProcessorPerformanceInfomation(1)[0];
                         
-                        idleTime = (UInt64)sysProcessorPerfInfo.IdleTime;
-                        kernelTime = (UInt64)sysProcessorPerfInfo.KernelTime;
-                        userTime = (UInt64)sysProcessorPerfInfo.UserTime;
+                        idleTime = sysProcessorPerfInfo.IdleTime;
+                        kernelTime = sysProcessorPerfInfo.KernelTime - idleTime;
+                        userTime = sysProcessorPerfInfo.UserTime;
                                 
-                        Int32 idleTimeDiff = (Int32)(idleTime - idleTimePrev);
-                        Int32 userTimeDiff = (Int32)(userTime - userTimePrev);
-                        Int32 kernelTimeDiff = (Int32)(kernelTime - kernelTimePrev);
-                        Int32 systemTimeDiff = (Int32)(userTimeDiff + kernelTimeDiff);
+                        Int64 idleTimeDiff = idleTime - idleTimePrev;
+            Int64 userTimeDiff = userTime - userTimePrev;
+            Int64 kernelTimeDiff = kernelTime - kernelTimePrev;
+            Int64 totalTimeDiff = idleTimeDiff + userTimeDiff + kernelTimeDiff;
 
                         idleTimePrev = idleTime;
@@ -42 +43 @@
 
                         return new CPUUsage(
-                                (Int32)(100 - ((Double)idleTimeDiff / userTimePrev) * 100),
-                                (Int32)(100 - ((Double)idleTimeDiff / kernelTimePrev) * 100),
-                                (Int32)(((Double)idleTimeDiff / (systemTimeDiff)) * 100)
+                                (Int32)(((Double)userTimeDiff / totalTimeDiff) * 100),
+                                (Int32)(((Double)kernelTimeDiff / totalTimeDiff) * 100),
+                                (Int32)(((Double)idleTimeDiff / totalTimeDiff) * 100)
                         );
                 }