Changeset 98

Timestamp:

12/06/07 15:36:02 (1 year ago)

Author:

rryu

Message:

メモリを2GB以上使っている場合でもステータスウインドウの表示がおかしくならないようにした。

Files:

• trunk/MacFaceFloat/AssemblyInfo.cs (modified) (1 diff)
• trunk/MacFaceFloat/MacFaceApp.cs (modified) (1 diff)
• trunk/MacFaceFloat/StatusWindow.cs (modified) (3 diffs)
• trunk/MacFaceLibrary/FaceDef.cs (modified) (2 diffs)
• trunk/MacFaceLibrary/MemoryStatistics.cs (modified) (3 diffs)
• trunk/MacFaceLibrary/MemoryStatisticsGlobalMemoryStatusEx.cs (modified) (1 diff)
• trunk/MacFaceLibrary/MemoryStatisticsNtQuerySystemInformation.cs (modified) (2 diffs)
• trunk/MacFaceLibrary/MemoryStatisticsPSAPI.cs (modified) (2 diffs)
• trunk/MacFaceLibrary/MemoryUsage.cs (modified) (3 diffs)

trunk/MacFaceFloat/AssemblyInfo.cs

@@ -27 +27 @@
-// ビルドおよびリビジョン番号を既定値にすることができます。
-
-09-14
-0
+12-05
+*
-[assembly: AssemblyVersion("1.0.*")]
-

trunk/MacFaceFloat/MacFaceApp.cs

@@ -302 +302 @@
-                                FaceDef.PatternSuite suite = FaceDef.PatternSuite.Normal;
-
-long avilable = (long
+UInt64 avilable = (UInt64
-                if (pageio_count > 100) 
-                                {

trunk/MacFaceFloat/StatusWindow.cs

@@ -129 +129 @@
-                        int fh = memoryGraph.Height;
-
-                       int totalMemory = (int
+            ulong totalMemory = (ulong
-                        double rate = (double)fh / (totalMemory * 1.5);
-                       
+            
-
-                        g.FillRectangle(new SolidBrush(Color.White), 0, 0, fw, fh);
@@ -160 +160 @@
-                                int h = 0;
-
-long
+UInt64
-                                h = (int)((kernelTotal) * rate);
-                                y -= h;
@@ -169 +169 @@
-                                g.FillRectangle(systemCacheBrush, x, y, w, h);
-
-                               h = (int)(usage.Committed
+                h = (int)((usage.Committed - kernelTotal)
-                                y -= h;
-                                g.FillRectangle(commitedBrush, x, y, w, h);

trunk/MacFaceLibrary/FaceDef.cs

@@ -209 +209 @@
-                }
-
+                public Image PatternImage(PatternSuite suite, int no, int markers)
+                {
+                        Bitmap image = new Bitmap(ImageWidth, ImageHeight);
+                        Graphics g = Graphics.FromImage(image);
+                        DrawPatternImage(g, suite, no, markers);
+                        g.Dispose();
+                        return image;
+                }
+
-                public void DrawPatternImage(Graphics g, PatternSuite suite, int no, int markers, float rate)
-                {
@@ -257 +266 @@
-                        }
-                }
-
-                public Image PatternImage(PatternSuite suite, int no, int markers)
-                {
-                        Bitmap image = new Bitmap(ImageWidth, ImageHeight);
-                        Graphics g = Graphics.FromImage(image);
-                        DrawPatternImage(g, suite, no, markers);
-                        g.Dispose();
-                        return image;
-                }
-        }
-

trunk/MacFaceLibrary/MemoryStatistics.cs

@@ -27 +27 @@
-                private PerformanceCounter commitLimitCounter;
-
-ulong
+UInt64
-
-                public MemoryStatistics(int historySize)
@@ -105 +105 @@
-                }
-
-ulong
+UInt64
-                {
-                        get { return totalVisibleMemorySize; }
@@ -126 +126 @@
-                protected virtual MemoryUsage NextValue()
-                {
-int available      = (int
-int committed      = (int
+UInt64 available      = (UInt64
+UInt64 committed      = (UInt64
-                        int pagein             = (int)pageinCounter.NextValue();
-                        int pageout        = (int)pageoutCounter.NextValue();
-int systemCache    = (int
-int kernelPaged    = (int
-int kernelNonPaged = (int
-int driverTotal    = (int
-int systemCodeTotal = (int
+UInt64 systemCache    = (UInt64
+UInt64 kernelPaged    = (UInt64
+UInt64 kernelNonPaged = (UInt64
+UInt64 driverTotal    = (UInt64
+UInt64 systemCodeTotal = (UInt64
-
-                        return new MemoryUsage(available, committed, pagein, pageout,

trunk/MacFaceLibrary/MemoryStatisticsGlobalMemoryStatusEx.cs

@@ -32 +32 @@
-                        Unmanaged.GlobalMemoryStatusEx(ref memStat);
-
-int available      = (int
-int committed      = (int
+UInt64 available      = (UInt64
+UInt64 committed      = (UInt64
-                        
-                        return new MemoryUsage(available, committed, 0, 0,

trunk/MacFaceLibrary/MemoryStatisticsNtQuerySystemInformation.cs

@@ -40 +40 @@
-                                out retLen);
-
-
+U
-                        
-32
+64
-                        
-                        Int32 pageIn = (Int32)((sysPerfInfo.PagesRead - _prevPagesRead)/ ((TimeSpan)(DateTime.Now - _prevCollectTime)).TotalSeconds);
@@ -51 +51 @@
-
-                        return new MemoryUsage(
-Int32
-Int32
+UInt64
+UInt64
-                                pageIn,
-                                pageOut,
-Int32
-Int32
-Int32
-Int32
-Int32
+UInt64
+UInt64
+UInt64
+UInt64
+UInt64
-                }
-

trunk/MacFaceLibrary/MemoryStatisticsPSAPI.cs

@@ -32 +32 @@
-                        Unmanaged.GetPerformanceInfo(out pInfo, (UInt32)Marshal.SizeOf(typeof(Unmanaged.PERFORMANCE_INFORMATION)));
-
-int available      = (int
-int committed      = (int
+UInt64 available      = (UInt64
+UInt64 committed      = (UInt64
-                        
-                        // TODO:
@@ -39 +39 @@
-                        int pageout        = (int)0;
-
-int systemCache    = (int
-int kernelPaged    = (int
-int kernelNonPaged = (int
+UInt64 systemCache    = (UInt64
+UInt64 kernelPaged    = (UInt64
+UInt64 kernelNonPaged = (UInt64
-
-                        // XXX: �Ƃ肠�����Е��蕪���Ă��܂�
-int
-int driverTotal    = (int
-int systemCodeTotal = (int
+UInt64
+UInt64 driverTotal    = (UInt64
+UInt64 systemCodeTotal = (UInt64
-
-                        return new MemoryUsage(available, committed, pagein, pageout,

trunk/MacFaceLibrary/MemoryUsage.cs

@@ -11 +11 @@
-        public class MemoryUsage
-        {
-int
-               private int
+UInt64
+        private UInt64
-                private int pagein;
-                private int pageout;
-               private int
-               private int
-               private int
-               private int
-               private int
+        private UInt64
+        private UInt64
+        private UInt64
+        private UInt64
+        private UInt64
-
-               public MemoryUsage(int available, int
-                       int systemCache, int kernelPaged, int kernelNonPaged, int driverTotal, int
+        public MemoryUsage(UInt64 available, UInt64
+            UInt64 systemCache, UInt64 kernelPaged, UInt64 kernelNonPaged, UInt64 driverTotal, UInt64
-                {
-                        this.available = available;
@@ -35 +35 @@
-                }
-
-int
+UInt64
-                {
-                        get { return available; }
-                }
-
-int
+UInt64
-                {
-                        get { return committed + systemCache + kernelPaged + KernelNonPaged + DriverTotal + SystemCodeTotal; }
-                }
-
-int
+UInt64
-                {
-                        get { return committed; }
@@ -60 +60 @@
-                }
-
-int
+UInt64
-                {
-                        get { return systemCache; }
-                }
-
-int
+UInt64
-                {
-                        get { return kernelPaged; }
-                }
-
-int
+UInt64
-                {
-                        get { return kernelNonPaged; }
-                }
-
-int
+UInt64
-                {
-                        get { return driverTotal; }
-                }
-
-int
+UInt64
-                {
-                        get { return systemCodeTotal; }