Changeset 98 for trunk/MacFaceLibrary/MemoryStatisticsPSAPI.cs

Timestamp:

Dec 6, 2007, 3:36:02 PM (16 years ago)

Author:

rryu

Message:

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

File:

• trunk/MacFaceLibrary/MemoryStatisticsPSAPI.cs (modified) (2 diffs)

trunk/MacFaceLibrary/MemoryStatisticsPSAPI.cs

@@ -32 +32 @@
                         Unmanaged.GetPerformanceInfo(out pInfo, (UInt32)Marshal.SizeOf(typeof(Unmanaged.PERFORMANCE_INFORMATION)));
 
-                        int available      = (int)(pInfo.PhysicalAvailable * pInfo.PageSize);
-                        int committed      = (int)(pInfo.CommitTotal * pInfo.PageSize);
+                        UInt64 available      = (UInt64)(pInfo.PhysicalAvailable * pInfo.PageSize);
+                        UInt64 committed      = (UInt64)(pInfo.CommitTotal * pInfo.PageSize);
                         
                         // TODO:
@@ -39 +39 @@
                         int pageout        = (int)0;
 
-                        int systemCache    = (int)(pInfo.SystemCache * pInfo.PageSize);
-                        int kernelPaged    = (int)(pInfo.KernelPaged * pInfo.PageSize);
-                        int kernelNonPaged = (int)(pInfo.KernelNonpaged * pInfo.PageSize);
+                        UInt64 systemCache    = (UInt64)(pInfo.SystemCache * pInfo.PageSize);
+                        UInt64 kernelPaged    = (UInt64)(pInfo.KernelPaged * pInfo.PageSize);
+                        UInt64 kernelNonPaged = (UInt64)(pInfo.KernelNonpaged * pInfo.PageSize);
 
                         // XXX: ‚Æ‚è‚ ‚¦‚¸•Ð•û‚ɐU‚蕪‚¯‚Ä‚µ‚Ü‚¤
-                        // int kernelTotal = usage.KernelNonPaged + usage.KernelPaged + usage.DriverTotal + usage.SystemCodeTotal;
-                        int driverTotal    = (int)0;
-                        int systemCodeTotal = (int)((pInfo.KernelTotal - (pInfo.KernelNonpaged + pInfo.KernelPaged)) * pInfo.PageSize);
+                        // UInt64 kernelTotal = usage.KernelNonPaged + usage.KernelPaged + usage.DriverTotal + usage.SystemCodeTotal;
+                        UInt64 driverTotal    = (UInt64)0;
+                        UInt64 systemCodeTotal = (UInt64)((pInfo.KernelTotal - (pInfo.KernelNonpaged + pInfo.KernelPaged)) * pInfo.PageSize);
 
                         return new MemoryUsage(available, committed, pagein, pageout,