Changeset 70

Timestamp:

Apr 14, 2006, 10:31:01 PM (18 years ago)

Author:

rryu

Message:

もう少し適切にメモリの状況を表情に反映させるようにした。

Location:

trunk

Files:

• MacFaceFloat/MacFaceApp.cs (modified) (3 diffs)
• MacFaceLibrary/MemoryUsage.cs (modified) (1 diff)

trunk/MacFaceFloat/MacFaceApp.cs

@@ -30 +30 @@
                 private CPUStatistics cpuStats;
                 private MemoryStatistics memStats;
+                private int pageio_count;
 
                 private System.Windows.Forms.Timer updateTimer;
@@ -51 +52 @@
                         config.Load();
 
-                        cpuStats = new CPUStatistics(61);
-                        memStats = new MemoryStatistics(61);
+                        cpuStats = new CPUStatistics(81);
+                        memStats = new MemoryStatistics(81);
+                        pageio_count = 0;
 
                         updateTimer = new System.Windows.Forms.Timer();
@@ -213 +215 @@
                         memStats.Update();
                         MemoryUsage memUsage = memStats.Latest;
-                        
+
+                        if (memUsage.Pagein > 0) pageio_count += memUsage.Pageout;
+                        pageio_count -= 50;
+                        if (pageio_count < 0) pageio_count = 0;
+
                         if (patternWindow != null) 
                         {
+                                int pattern = cpuUsage.Active / 10;
+                                pattern += memUsage.Pageout / 20;
+                                pattern += memUsage.Pagein / 50;
+                                if (pattern > 10) pattern = 10;
+
                                 FaceDef.PatternSuite suite = FaceDef.PatternSuite.Normal;
 
-                                int pattern = cpuUsage.Active / 10;
-                                int avilable = (int)memStats.TotalVisibleMemorySize * 1024 - memUsage.Committed;
-                                if (avilable < (10 * 1024 *1024)) 
+                                int avilable = (int)memStats.TotalVisibleMemorySize * 1024 - memUsage.Used;
+                                if (pageio_count > 100) 
+                                {
+                                        suite = FaceDef.PatternSuite.MemoryInsufficient;
+                                }
+                                else if (avilable < 0) 
                                 {
                                         suite = FaceDef.PatternSuite.MemoryInsufficient;
                                 } 
-                                else if (memUsage.Available < (30 * 1024 *1024)) 
+                                else if (avilable < (10 * 1024 *1024)) 
                                 {
                                         suite = FaceDef.PatternSuite.MemoryDecline;

trunk/MacFaceLibrary/MemoryUsage.cs

@@ -38 +38 @@
                 {
                         get { return available; }
+                }
+
+                public int Used
+                {
+                        get { return committed + systemCache + kernelPaged + KernelNonPaged + DriverTotal + SystemCodeTotal; }
                 }