Changeset 98
- Timestamp:
- Dec 6, 2007, 3:36:02 PM (16 years ago)
- Location:
- trunk
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MacFaceFloat/AssemblyInfo.cs
r93 r98 27 27 // ビルドおよびリビジョン番号を既定値にすることができます。 28 28 29 [assembly: MacFace.FloatApp.ApplicationVersionString("2007- 09-14(アルファ版)")]30 [assembly: AssemblyInformationalVersion("1.0.0. 0")]29 [assembly: MacFace.FloatApp.ApplicationVersionString("2007-12-05 (アルファ版)")] 30 [assembly: AssemblyInformationalVersion("1.0.0.*")] 31 31 [assembly: AssemblyVersion("1.0.*")] 32 32 -
trunk/MacFaceFloat/MacFaceApp.cs
r92 r98 307 307 FaceDef.PatternSuite suite = FaceDef.PatternSuite.Normal; 308 308 309 long avilable = (long)memStats.TotalVisibleMemorySize * 1024 - memUsage.Used;309 UInt64 avilable = (UInt64)memStats.TotalVisibleMemorySize * 1024 - memUsage.Used; 310 310 if (pageio_count > 100) 311 311 { -
trunk/MacFaceFloat/StatusWindow.cs
r91 r98 129 129 int fh = memoryGraph.Height; 130 130 131 int totalMemory = (int)memStats.TotalVisibleMemorySize * 1024;131 ulong totalMemory = (ulong)memStats.TotalVisibleMemorySize * 1024; 132 132 double rate = (double)fh / (totalMemory * 1.5); 133 133 int border = (int)(totalMemory * rate); 134 134 135 135 g.FillRectangle(new SolidBrush(Color.White), 0, 0, fw, fh); … … 160 160 int h = 0; 161 161 162 longkernelTotal = usage.KernelNonPaged + usage.KernelPaged + usage.DriverTotal + usage.SystemCodeTotal;162 UInt64 kernelTotal = usage.KernelNonPaged + usage.KernelPaged + usage.DriverTotal + usage.SystemCodeTotal; 163 163 h = (int)((kernelTotal) * rate); 164 164 y -= h; … … 169 169 g.FillRectangle(systemCacheBrush, x, y, w, h); 170 170 171 h = (int)(usage.Committed* rate);171 h = (int)((usage.Committed - kernelTotal) * rate); 172 172 y -= h; 173 173 g.FillRectangle(commitedBrush, x, y, w, h); -
trunk/MacFaceLibrary/FaceDef.cs
r95 r98 209 209 } 210 210 211 public Image PatternImage(PatternSuite suite, int no, int markers) 212 { 213 Bitmap image = new Bitmap(ImageWidth, ImageHeight); 214 Graphics g = Graphics.FromImage(image); 215 DrawPatternImage(g, suite, no, markers); 216 g.Dispose(); 217 return image; 218 } 219 211 220 public void DrawPatternImage(Graphics g, PatternSuite suite, int no, int markers, float rate) 212 221 { … … 257 266 } 258 267 } 259 260 public Image PatternImage(PatternSuite suite, int no, int markers)261 {262 Bitmap image = new Bitmap(ImageWidth, ImageHeight);263 Graphics g = Graphics.FromImage(image);264 DrawPatternImage(g, suite, no, markers);265 g.Dispose();266 return image;267 }268 268 } 269 269 -
trunk/MacFaceLibrary/MemoryStatistics.cs
r75 r98 27 27 private PerformanceCounter commitLimitCounter; 28 28 29 private ulongtotalVisibleMemorySize;29 private UInt64 totalVisibleMemorySize; 30 30 31 31 public MemoryStatistics(int historySize) … … 105 105 } 106 106 107 public ulongTotalVisibleMemorySize107 public UInt64 TotalVisibleMemorySize 108 108 { 109 109 get { return totalVisibleMemorySize; } … … 126 126 protected virtual MemoryUsage NextValue() 127 127 { 128 int available = (int)availableCounter.NextValue();129 int committed = (int)committedCounter.NextValue();128 UInt64 available = (UInt64)availableCounter.NextValue(); 129 UInt64 committed = (UInt64)committedCounter.NextValue(); 130 130 int pagein = (int)pageinCounter.NextValue(); 131 131 int pageout = (int)pageoutCounter.NextValue(); 132 int systemCache = (int)systemCacheCounter.NextValue();133 int kernelPaged = (int)kernelPagedCounter.NextValue();134 int kernelNonPaged = (int)kernelNonPagedCounter.NextValue();135 int driverTotal = (int)driverTotalCounter.NextValue();136 int systemCodeTotal = (int)systemCodeTotalCounter.NextValue();132 UInt64 systemCache = (UInt64)systemCacheCounter.NextValue(); 133 UInt64 kernelPaged = (UInt64)kernelPagedCounter.NextValue(); 134 UInt64 kernelNonPaged = (UInt64)kernelNonPagedCounter.NextValue(); 135 UInt64 driverTotal = (UInt64)driverTotalCounter.NextValue(); 136 UInt64 systemCodeTotal = (UInt64)systemCodeTotalCounter.NextValue(); 137 137 138 138 return new MemoryUsage(available, committed, pagein, pageout, -
trunk/MacFaceLibrary/MemoryStatisticsGlobalMemoryStatusEx.cs
r77 r98 32 32 Unmanaged.GlobalMemoryStatusEx(ref memStat); 33 33 34 int available = (int)(memStat.ullAvailPageFile);35 int committed = (int)(memStat.ullTotalPageFile - memStat.ullAvailPageFile);34 UInt64 available = (UInt64)(memStat.ullAvailPageFile); 35 UInt64 committed = (UInt64)(memStat.ullTotalPageFile - memStat.ullAvailPageFile); 36 36 37 37 return new MemoryUsage(available, committed, 0, 0, -
trunk/MacFaceLibrary/MemoryStatisticsNtQuerySystemInformation.cs
r81 r98 40 40 out retLen); 41 41 42 Int32 pageSize = 4096;42 UInt32 pageSize = 4096; 43 43 44 _commitLimit = (UInt 32)(sysPerfInfo.TotalCommitLimit * pageSize);44 _commitLimit = (UInt64)(sysPerfInfo.TotalCommitLimit * pageSize); 45 45 46 46 Int32 pageIn = (Int32)((sysPerfInfo.PagesRead - _prevPagesRead)/ ((TimeSpan)(DateTime.Now - _prevCollectTime)).TotalSeconds); … … 51 51 52 52 return new MemoryUsage( 53 ( Int32)sysPerfInfo.AvailablePages * pageSize,54 ( Int32)sysPerfInfo.TotalCommittedPages * pageSize,53 (UInt64)sysPerfInfo.AvailablePages * pageSize, 54 (UInt64)sysPerfInfo.TotalCommittedPages * pageSize, 55 55 pageIn, 56 56 pageOut, 57 ( Int32)sysPerfInfo.MmSystemCachePage * pageSize,58 ( Int32)sysPerfInfo.PagedPoolUsage * pageSize,59 ( Int32)sysPerfInfo.NonPagedPoolUsage * pageSize,60 ( Int32)sysPerfInfo.SystemDriverPage * pageSize,61 ( Int32)sysPerfInfo.SystemCodePage * pageSize);57 (UInt64)sysPerfInfo.MmSystemCachePage * pageSize, 58 (UInt64)sysPerfInfo.PagedPoolUsage * pageSize, 59 (UInt64)sysPerfInfo.NonPagedPoolUsage * pageSize, 60 (UInt64)sysPerfInfo.SystemDriverPage * pageSize, 61 (UInt64)sysPerfInfo.SystemCodePage * pageSize); 62 62 } 63 63 -
trunk/MacFaceLibrary/MemoryStatisticsPSAPI.cs
r73 r98 32 32 Unmanaged.GetPerformanceInfo(out pInfo, (UInt32)Marshal.SizeOf(typeof(Unmanaged.PERFORMANCE_INFORMATION))); 33 33 34 int available = (int)(pInfo.PhysicalAvailable * pInfo.PageSize);35 int committed = (int)(pInfo.CommitTotal * pInfo.PageSize);34 UInt64 available = (UInt64)(pInfo.PhysicalAvailable * pInfo.PageSize); 35 UInt64 committed = (UInt64)(pInfo.CommitTotal * pInfo.PageSize); 36 36 37 37 // TODO: … … 39 39 int pageout = (int)0; 40 40 41 int systemCache = (int)(pInfo.SystemCache * pInfo.PageSize);42 int kernelPaged = (int)(pInfo.KernelPaged * pInfo.PageSize);43 int kernelNonPaged = (int)(pInfo.KernelNonpaged * pInfo.PageSize);41 UInt64 systemCache = (UInt64)(pInfo.SystemCache * pInfo.PageSize); 42 UInt64 kernelPaged = (UInt64)(pInfo.KernelPaged * pInfo.PageSize); 43 UInt64 kernelNonPaged = (UInt64)(pInfo.KernelNonpaged * pInfo.PageSize); 44 44 45 45 // XXX: Æè ¦¸ÐûÉU誯ĵܤ 46 // intkernelTotal = usage.KernelNonPaged + usage.KernelPaged + usage.DriverTotal + usage.SystemCodeTotal;47 int driverTotal = (int)0;48 int systemCodeTotal = (int)((pInfo.KernelTotal - (pInfo.KernelNonpaged + pInfo.KernelPaged)) * pInfo.PageSize);46 // UInt64 kernelTotal = usage.KernelNonPaged + usage.KernelPaged + usage.DriverTotal + usage.SystemCodeTotal; 47 UInt64 driverTotal = (UInt64)0; 48 UInt64 systemCodeTotal = (UInt64)((pInfo.KernelTotal - (pInfo.KernelNonpaged + pInfo.KernelPaged)) * pInfo.PageSize); 49 49 50 50 return new MemoryUsage(available, committed, pagein, pageout, -
trunk/MacFaceLibrary/MemoryUsage.cs
r70 r98 11 11 public class MemoryUsage 12 12 { 13 private intavailable;14 private intcommitted;13 private UInt64 available; 14 private UInt64 committed; 15 15 private int pagein; 16 16 private int pageout; 17 private intsystemCache;18 private intkernelPaged;19 private intkernelNonPaged;20 private intdriverTotal;21 private intsystemCodeTotal;17 private UInt64 systemCache; 18 private UInt64 kernelPaged; 19 private UInt64 kernelNonPaged; 20 private UInt64 driverTotal; 21 private UInt64 systemCodeTotal; 22 22 23 public MemoryUsage(int available, intcommitted, int pagein, int pageout,24 int systemCache, int kernelPaged, int kernelNonPaged, int driverTotal, intsystemCodeTotal)23 public MemoryUsage(UInt64 available, UInt64 committed, int pagein, int pageout, 24 UInt64 systemCache, UInt64 kernelPaged, UInt64 kernelNonPaged, UInt64 driverTotal, UInt64 systemCodeTotal) 25 25 { 26 26 this.available = available; … … 35 35 } 36 36 37 public intAvailable37 public UInt64 Available 38 38 { 39 39 get { return available; } 40 40 } 41 41 42 public intUsed42 public UInt64 Used 43 43 { 44 44 get { return committed + systemCache + kernelPaged + KernelNonPaged + DriverTotal + SystemCodeTotal; } 45 45 } 46 46 47 public intCommitted47 public UInt64 Committed 48 48 { 49 49 get { return committed; } … … 60 60 } 61 61 62 public intSystemCache62 public UInt64 SystemCache 63 63 { 64 64 get { return systemCache; } 65 65 } 66 66 67 public intKernelPaged67 public UInt64 KernelPaged 68 68 { 69 69 get { return kernelPaged; } 70 70 } 71 71 72 public intKernelNonPaged72 public UInt64 KernelNonPaged 73 73 { 74 74 get { return kernelNonPaged; } 75 75 } 76 76 77 public intDriverTotal77 public UInt64 DriverTotal 78 78 { 79 79 get { return driverTotal; } 80 80 } 81 81 82 public intSystemCodeTotal82 public UInt64 SystemCodeTotal 83 83 { 84 84 get { return systemCodeTotal; }
Note: See TracChangeset
for help on using the changeset viewer.