Changeset 61

Timestamp:

Sep 9, 2005, 2:13:57 AM (19 years ago)

Author:

rryu

Message:

CPU利用統計、メモリ利用統計の処理をアプリケーションクラスから専用のクラスに移した。
それに伴い不要になった*Counter系クラスを削除した。

Location:

trunk

Files:

• MacFaceFloat/MacFaceApp.cs (modified) (9 diffs)
• MacFaceLibrary/CPUStatistics.cs (added)
• MacFaceLibrary/CPUUsageCounter.cs (deleted)
• MacFaceLibrary/MacFaceLibrary.csproj (modified) (2 diffs)
• MacFaceLibrary/MemoryStatistics.cs (added)
• MacFaceLibrary/MemoryUsageCounter.cs (deleted)

trunk/MacFaceFloat/MacFaceApp.cs

@@ -29 +29 @@
                 
                 private System.Windows.Forms.Timer updateTimer;
-                private CPUUsageCounter cpuCounter;
-                private MemoryUsageCounter memoryCounter;
 
                 private StatusWindow statusWindow;
@@ -36 +34 @@
                 private Bitmap memoryGraph;
 
-                private CPUUsage[] cpuHistory;
-                private int cpuHistoryHead;
-                private int cpuHistoryCount;
-
-                private MemoryUsage[] memHistory;
-                private int memHistoryHead;
-                private int memHistoryCount;
+                private CPUStatistics cpuStats;
+                private MemoryStatistics memStats;
 
                 [STAThread]
@@ -56 +49 @@
                         config.Load();
 
-                        cpuHistory = new CPUUsage[61];
-                        cpuHistoryCount = 0;
-                        cpuHistoryHead = 0;
-
-                        memHistory = new MemoryUsage[61];
-                        memHistoryCount = 0;
-                        memHistoryHead = 0;
-
-                        cpuCounter = new CPUUsageCounter();
-                        memoryCounter = new MemoryUsageCounter();
+                        cpuStats = new CPUStatistics(61);
+                        memStats = new MemoryStatistics(61);
 
                         updateTimer = new System.Windows.Forms.Timer();
@@ -204 +189 @@
                 public void CountProcessorUsage(object sender, EventArgs e)
                 {
-                        CPUUsage cpuUsage = cpuCounter.CurrentUsage();
-                        MemoryUsage memUsage = memoryCounter.CurrentUsage();
-
-                        cpuHistory[cpuHistoryHead++] = cpuUsage;
-                        if (cpuHistoryHead >= cpuHistory.Length) cpuHistoryHead = 0;
-                        if (cpuHistoryCount < cpuHistory.Length) cpuHistoryCount++;
-
-                        memHistory[memHistoryHead++] = memUsage;
-                        if (memHistoryHead >= memHistory.Length) memHistoryHead = 0;
-                        if (memHistoryCount < memHistory.Length) memHistoryCount++;
-
+                        cpuStats.Update();
+                        CPUUsage cpuUsage = cpuStats.Latest;
+
+                        memStats.Update();
+                        MemoryUsage memUsage = memStats.Latest;
+                        
                         if (patternWindow != null) 
                         {
@@ -220 +200 @@
 
                                 int pattern = cpuUsage.Active / 10;
-                                int avilable = (int)MemoryUsageCounter.TotalVisibleMemorySize * 1024 - memUsage.Committed;
+                                int avilable = (int)memStats.TotalVisibleMemorySize * 1024 - memUsage.Committed;
                                 if (avilable < (10 * 1024 *1024)) 
                                 {
@@ -360 +340 @@
                         g.DrawLine(Pens.Gray, 0, 50, 300, 50);
 
-                        if (cpuHistoryCount >= 2) 
-                        {
-                                Point[] userGraph = new Point[cpuHistoryCount+2];
-                                Point[] sysGraph = new Point[cpuHistoryCount+2];
-
-                                userGraph[cpuHistoryCount+0].X = 300 - (cpuHistoryCount-1) * 5;
-                                userGraph[cpuHistoryCount+0].Y = 100 - 0;
-                                userGraph[cpuHistoryCount+1].X = 300 - 0 * 5;
-                                userGraph[cpuHistoryCount+1].Y = 100 - 0;
-
-                                sysGraph[cpuHistoryCount+0].X = 300 - (cpuHistoryCount-1) * 5;
-                                sysGraph[cpuHistoryCount+0].Y = 100 - 0;
-                                sysGraph[cpuHistoryCount+1].X = 300 - 0 * 5;
-                                sysGraph[cpuHistoryCount+1].Y = 100 - 0;
-
-                                int pos = cpuHistoryHead - 1;
-                                for (int i = 0; i < cpuHistoryCount; i++) 
+                        int count = cpuStats.Count;
+
+                        if (count >= 2) 
+                        {
+                                Point[] userGraph = new Point[count+2];
+                                Point[] sysGraph = new Point[count+2];
+
+                                userGraph[count+0].X = 300 - (count-1) * 5;
+                                userGraph[count+0].Y = 100 - 0;
+                                userGraph[count+1].X = 300 - 0 * 5;
+                                userGraph[count+1].Y = 100 - 0;
+
+                                sysGraph[count+0].X = 300 - (count-1) * 5;
+                                sysGraph[count+0].Y = 100 - 0;
+                                sysGraph[count+1].X = 300 - 0 * 5;
+                                sysGraph[count+1].Y = 100 - 0;
+
+                                for (int i = 0; i < count; i++) 
                                 {
-                                        if (pos < 0) pos = cpuHistory.Length - 1;
-                                        CPUUsage usage = cpuHistory[pos];
+                                        CPUUsage usage = cpuStats[i];
                                         userGraph[i].X = sysGraph[i].X = 300 - i * 5;
                                         userGraph[i].Y = 100 - usage.Active;
                                         sysGraph[i].Y = 100 - usage.System;
-                                        pos--;
                                 }
 
@@ -398 +377 @@
                         Graphics g = Graphics.FromImage(memoryGraph);
 
-                        int totalMemory = (int)MemoryUsageCounter.TotalVisibleMemorySize * 1024;
-                        double rate = 100.0 / MemoryUsageCounter.CommitLimit;
+                        int totalMemory = (int)memStats.TotalVisibleMemorySize * 1024;
+                        double rate = 100.0 / memStats.CommitLimit;
                         int border = (int)(totalMemory * rate);
 
@@ -417 +396 @@
                         Brush spaceBrush = new SolidBrush(Color.FromArgb(100, 100, 100, 255));
 
-                        int pos = memHistoryHead - 1;
-                        for (int i = 0; i < memHistoryCount; i++) 
-                        {
-                                if (pos < 0) pos = memHistory.Length - 1;
-                                MemoryUsage usage = memHistory[pos];
+                        int count = memStats.Count;
+
+                        for (int i = 0; i < count; i++) 
+                        {
+                                MemoryUsage usage = memStats[i];
 
                                 int x = 300 - i * 5 - 5;
@@ -461 +440 @@
                                 y = 100 - h;
                                 g.FillRectangle(Brushes.Black, x, y, w, h);
-
-                                pos--;
                         }
                         Pen borderPen = new Pen(Color.Blue);

trunk/MacFaceLibrary/MacFaceLibrary.csproj

@@ -100 +100 @@
                 />
                 <File
-                    RelPath = "CPUUsage.cs"
+                    RelPath = "CPUStatistics.cs"
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
                 <File
-                    RelPath = "CPUUsageCounter.cs"
+                    RelPath = "CPUUsage.cs"
                     SubType = "Code"
                     BuildAction = "Compile"
@@ -120 +120 @@
                 />
                 <File
-                    RelPath = "MemoryUsage.cs"
+                    RelPath = "MemoryStatistics.cs"
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
                 <File
-                    RelPath = "MemoryUsageCounter.cs"
+                    RelPath = "MemoryUsage.cs"
                     SubType = "Code"
                     BuildAction = "Compile"