Changeset 124 for trunk/MacFaceFloat/MacFaceApp.cs

Timestamp:

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

Author:

rryu

Message:

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

File:

• trunk/MacFaceFloat/MacFaceApp.cs (modified) (3 diffs)

trunk/MacFaceFloat/MacFaceApp.cs

@@ -48 +48 @@
                 public static void Main(string[] args)
                 {
+            //NtKernel.SYSTEM_BASIC_INFORMATION info = NtKernel.QuerySystemBasicInformation();
+            //NtKernel.SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION[] list =
+            //    NtKernel.QuerySystemProcessorPerformanceInfomation((int)info.ActiveProcessors);
+            //MachineStatus status = MachineStatus.LocalMachineStatus();
+            //int c = status.ProcessorCount;
+            //NtKernel.SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION[] list = status.ProcessorPerformances();
+
             Application.EnableVisualStyles();
             AppDomain.CurrentDomain.UnhandledException += new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException);
@@ -54 +61 @@
                 }
 
-                /// <summary>
-                /// Windows 2000 ‚̓pƒtƒH[ƒ}ƒ“ƒXƒ‚ƒjƒ^‚ªƒ_ƒ‚È‚ç‚»‚ꂼ‚êAPI‚Å‚ª‚ñ‚΂é
-                /// </summary>
-                public void SetupStatisticsForWindows2000()
-                {
-//                      cpuStats = new CPUStatistics(81);
-//                      memStats = new MemoryStatistics(81);
-//
-//                      try 
-//                      {
-//                              // ŽŽ‚µ‚ɃJƒEƒ“ƒ^‚ðŽÀs‚µ‚Ä‚Ý‚é
-//                              cpuStats.Update();
-//                              memStats.Update();
-//                      } 
-//                      catch (System.ComponentModel.Win32Exception) 
-//                      {
-//                              // ƒ_ƒ‚¾‚Á‚½‚̂ŃpƒtƒH[ƒ}ƒ“ƒXƒJƒEƒ“ƒ^‚ðŽg‚í‚È‚¢•û–@‚Ö
-//                              cpuStats = new CPUStatisticsNtQuerySystemInformation(61);
-//                              memStats = new MemoryStatisticsGlobalMemoryStatusEx(61);
-//                      }
-//                      catch (System.InvalidOperationException) 
-//                      {
-//                              // ƒ_ƒ‚¾‚Á‚½‚̂ŃpƒtƒH[ƒ}ƒ“ƒXƒJƒEƒ“ƒ^‚ðŽg‚í‚È‚¢•û–@‚Ö
-//                              cpuStats = new CPUStatisticsNtQuerySystemInformation(61);
-//                              memStats = new MemoryStatisticsGlobalMemoryStatusEx(61);
-//                      }
-
-                        cpuStats = new CPUStatisticsNtQuerySystemInformation(61);
-                        memStats = new MemoryStatisticsNtQuerySystemInformation(61);
-                }
-
-                public void SetupStatisticsForWindowsXP()
-                {
-//                      cpuStats = new CPUStatistics(81);
-//                      memStats = new MemoryStatistics(81);
-//                      try 
-//                      {
-//                              // ŽŽ‚µ‚ɃJƒEƒ“ƒ^‚ðŽÀs‚µ‚Ä‚Ý‚é
-//                              cpuStats.Update();
-//                              memStats.Update();
-//                      } 
-//                      catch (System.ComponentModel.Win32Exception) 
-//                      {
-//                              // ƒ_ƒ‚¾‚Á‚½‚̂ŃpƒtƒH[ƒ}ƒ“ƒXƒJƒEƒ“ƒ^‚ðŽg‚í‚È‚¢•û–@‚Ö
-//                              cpuStats = new CPUStatisticsGetSystemTime(61);
-//                              memStats = new MemoryStatisticsNtQuerySystemInformation(61);
-//                      }
-//                      catch (System.InvalidOperationException) 
-//                      {
-//                              // ƒ_ƒ‚¾‚Á‚½‚̂ŃpƒtƒH[ƒ}ƒ“ƒXƒJƒEƒ“ƒ^‚ðŽg‚í‚È‚¢•û–@‚Ö
-//                              cpuStats = new CPUStatisticsGetSystemTime(61);
-//                              memStats = new MemoryStatisticsPSAPI(61);
-//                      }
-
-                        cpuStats = new CPUStatisticsGetSystemTime(61);
-                        memStats = new MemoryStatisticsNtQuerySystemInformation(61);
-                }
 
                 public MacFaceApp()
@@ -119 +69 @@
                         pageio_count = 0;
 
-                        // OS ‚²‚ƂɎ擾‚·‚é•û–@‚ð•ÏX‚·‚é
-                        if (Environment.OSVersion.Version.Major == 5 && Environment.OSVersion.Version.Minor == 0)
-                        {
-                                SetupStatisticsForWindows2000();
-                        }
-                        else
-                        {
-                                // XP / 2003 / Vista
-                                SetupStatisticsForWindowsXP();
-                        }
+            cpuStats = new CPUStatisticsNtQuerySystemInformation(61);
+            memStats = new MemoryStatisticsNtQuerySystemInformation(61);
+
+            patternWindow = null;
+            statusWindow = null;
+
+            InitializeComponent();
+
+            // x64 ŠÂ‹«‚Å 32bit ‚È OptimusMini.dll ‚ð“ǂݍž‚à‚¤‚Æ‚·‚é‚Æ“–‘RƒGƒ‰[‚Æ‚È‚é‚̂ʼn½‚à‚µ‚È‚¢ƒNƒ‰ƒX‚É‚µ‚Ä‚¨‚­
+                    optimusMini = (IntPtr.Size == 4 ? (IOptimusMini)new OptimusMini() : new OptimusMiniMock());
+            optimusMini.DisplayOn();
 
             //OptimusMini.OnKeyDownCallbackDelegate oKD = new OptimusMini.OnKeyDownCallbackDelegate(OnKeyDownCallbackHandler);
             //OptimusMini.OnDeviceStateChangedCallbackDelegate oDSC = new OptimusMini.OnDeviceStateChangedCallbackDelegate(OnDeviceStateChangedCallbackHandler);
             //OptimusMini.RegisterEventHandler(oKD, oDSC);
-
-            patternWindow = null;
-            statusWindow = null;
-
-            InitializeComponent();
-
-            // x64 ŠÂ‹«‚Å 32bit ‚È OptimusMini.dll ‚ð“ǂݍž‚à‚¤‚Æ‚·‚é‚Æ“–‘RƒGƒ‰[‚Æ‚È‚é‚̂ʼn½‚à‚µ‚È‚¢ƒNƒ‰ƒX‚É‚µ‚Ä‚¨‚­
-                    optimusMini = (IntPtr.Size == 4 ? (IOptimusMini)new OptimusMini() : new OptimusMiniMock());
-            optimusMini.DisplayOn();
 
             CountProcessorUsage(null, null);