Index: /branches/eraser6/CodeReview/Eraser.Manager/EntropySource.cs =================================================================== --- /branches/eraser6/CodeReview/Eraser.Manager/EntropySource.cs (revision 1567) +++ /branches/eraser6/CodeReview/Eraser.Manager/EntropySource.cs (revision 1568) @@ -353,5 +353,5 @@ //The high resolution performance counter - result.AddRange(StructToBuffer(KernelApi.PerformanceCounter)); + result.AddRange(StructToBuffer(SystemInfo.PerformanceCounter)); //Ticks since start up Index: /branches/eraser6/CodeReview/Eraser.Util/SystemInfo.cs =================================================================== --- /branches/eraser6/CodeReview/Eraser.Util/SystemInfo.cs (revision 1568) +++ /branches/eraser6/CodeReview/Eraser.Util/SystemInfo.cs (revision 1568) @@ -0,0 +1,130 @@ +/* + * $Id$ + * Copyright 2008-2009 The Eraser Project + * Original Author: Joel Low + * Modified By: Garrett Trant + * + * This file is part of Eraser. + * + * Eraser is free software: you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation, either version 3 of the License, or (at your option) any later + * version. + * + * Eraser is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR + * A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * A copy of the GNU General Public License can be found at + * . + */ + +using System; +using System.Collections.Generic; +using System.Text; +using System.Reflection; +using System.Runtime.InteropServices; +using Microsoft.Win32.SafeHandles; +using System.ComponentModel; + +namespace Eraser.Util +{ + public static class SystemInfo + { + /// + /// Retrieves the current value of the high-resolution performance counter. + /// + public static long PerformanceCounter + { + get + { + long result = 0; + if (NativeMethods.QueryPerformanceCounter(out result)) + return result; + return 0; + } + } + + /// + /// Gets the current CPU type of the system. + /// + /// One of the enumeration values. + public static ProcessorArchitecture ProcessorArchitecture + { + get + { + NativeMethods.SYSTEM_INFO info = new NativeMethods.SYSTEM_INFO(); + NativeMethods.GetSystemInfo(out info); + + switch (info.processorArchitecture) + { + case NativeMethods.SYSTEM_INFO.ProcessorArchitecture.PROCESSOR_ARCHITECTURE_AMD64: + return ProcessorArchitecture.Amd64; + case NativeMethods.SYSTEM_INFO.ProcessorArchitecture.PROCESSOR_ARCHITECTURE_IA64: + return ProcessorArchitecture.IA64; + case NativeMethods.SYSTEM_INFO.ProcessorArchitecture.PROCESSOR_ARCHITECTURE_INTEL: + return ProcessorArchitecture.X86; + default: + return ProcessorArchitecture.None; + } + } + } + + public class DiskPerformanceInfo + { + unsafe internal DiskPerformanceInfo(NativeMethods.DiskPerformanceInfoInternal info) + { + BytesRead = info.BytesRead; + BytesWritten = info.BytesWritten; + ReadTime = info.ReadTime; + WriteTime = info.WriteTime; + IdleTime = info.IdleTime; + ReadCount = info.ReadCount; + WriteCount = info.WriteCount; + QueueDepth = info.QueueDepth; + SplitCount = info.SplitCount; + QueryTime = info.QueryTime; + StorageDeviceNumber = info.StorageDeviceNumber; + StorageManagerName = new string((char*)info.StorageManagerName); + } + + public long BytesRead { get; private set; } + public long BytesWritten { get; private set; } + public long ReadTime { get; private set; } + public long WriteTime { get; private set; } + public long IdleTime { get; private set; } + public uint ReadCount { get; private set; } + public uint WriteCount { get; private set; } + public uint QueueDepth { get; private set; } + public uint SplitCount { get; private set; } + public long QueryTime { get; private set; } + public uint StorageDeviceNumber { get; private set; } + public string StorageManagerName { get; private set; } + } + + /// + /// Queries the performance information for the given disk. + /// + /// A read-only handle to a device (disk). + /// A DiskPerformanceInfo structure describing the performance + /// information for the given disk. + public static DiskPerformanceInfo QueryDiskPerformanceInfo(SafeFileHandle diskHandle) + { + if (diskHandle.IsInvalid) + throw new ArgumentException("The disk handle must not be invalid."); + + //This only works if the user has turned on the disk performance + //counters with 'diskperf -y'. These counters are off by default + NativeMethods.DiskPerformanceInfoInternal result = + new NativeMethods.DiskPerformanceInfoInternal(); + uint bytesReturned = 0; + if (NativeMethods.DeviceIoControl(diskHandle, NativeMethods.IOCTL_DISK_PERFORMANCE, + IntPtr.Zero, 0, out result, (uint)Marshal.SizeOf(result), out bytesReturned, IntPtr.Zero)) + { + return new DiskPerformanceInfo(result); + } + + return null; + } + } +} Index: /branches/eraser6/CodeReview/Eraser.Util/Eraser.Util.csproj =================================================================== --- /branches/eraser6/CodeReview/Eraser.Util/Eraser.Util.csproj (revision 1567) +++ /branches/eraser6/CodeReview/Eraser.Util/Eraser.Util.csproj (revision 1568) @@ -67,5 +67,5 @@ - + Index: anches/eraser6/CodeReview/Eraser.Util/KernelApi.cs =================================================================== --- /branches/eraser6/CodeReview/Eraser.Util/KernelApi.cs (revision 1567) +++ (revision ) @@ -1,130 +1,0 @@ -/* - * $Id$ - * Copyright 2008-2009 The Eraser Project - * Original Author: Joel Low - * Modified By: Garrett Trant - * - * This file is part of Eraser. - * - * Eraser is free software: you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation, either version 3 of the License, or (at your option) any later - * version. - * - * Eraser is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - * A PARTICULAR PURPOSE. See the GNU General Public License for more details. - * - * A copy of the GNU General Public License can be found at - * . - */ - -using System; -using System.Collections.Generic; -using System.Text; -using System.Reflection; -using System.Runtime.InteropServices; -using Microsoft.Win32.SafeHandles; -using System.ComponentModel; - -namespace Eraser.Util -{ - public static class KernelApi - { - /// - /// Retrieves the current value of the high-resolution performance counter. - /// - public static long PerformanceCounter - { - get - { - long result = 0; - if (NativeMethods.QueryPerformanceCounter(out result)) - return result; - return 0; - } - } - - /// - /// Gets the current CPU type of the system. - /// - /// One of the enumeration values. - public static ProcessorArchitecture ProcessorArchitecture - { - get - { - NativeMethods.SYSTEM_INFO info = new NativeMethods.SYSTEM_INFO(); - NativeMethods.GetSystemInfo(out info); - - switch (info.processorArchitecture) - { - case NativeMethods.SYSTEM_INFO.ProcessorArchitecture.PROCESSOR_ARCHITECTURE_AMD64: - return ProcessorArchitecture.Amd64; - case NativeMethods.SYSTEM_INFO.ProcessorArchitecture.PROCESSOR_ARCHITECTURE_IA64: - return ProcessorArchitecture.IA64; - case NativeMethods.SYSTEM_INFO.ProcessorArchitecture.PROCESSOR_ARCHITECTURE_INTEL: - return ProcessorArchitecture.X86; - default: - return ProcessorArchitecture.None; - } - } - } - - public class DiskPerformanceInfo - { - unsafe internal DiskPerformanceInfo(NativeMethods.DiskPerformanceInfoInternal info) - { - BytesRead = info.BytesRead; - BytesWritten = info.BytesWritten; - ReadTime = info.ReadTime; - WriteTime = info.WriteTime; - IdleTime = info.IdleTime; - ReadCount = info.ReadCount; - WriteCount = info.WriteCount; - QueueDepth = info.QueueDepth; - SplitCount = info.SplitCount; - QueryTime = info.QueryTime; - StorageDeviceNumber = info.StorageDeviceNumber; - StorageManagerName = new string((char*)info.StorageManagerName); - } - - public long BytesRead { get; private set; } - public long BytesWritten { get; private set; } - public long ReadTime { get; private set; } - public long WriteTime { get; private set; } - public long IdleTime { get; private set; } - public uint ReadCount { get; private set; } - public uint WriteCount { get; private set; } - public uint QueueDepth { get; private set; } - public uint SplitCount { get; private set; } - public long QueryTime { get; private set; } - public uint StorageDeviceNumber { get; private set; } - public string StorageManagerName { get; private set; } - } - - /// - /// Queries the performance information for the given disk. - /// - /// A read-only handle to a device (disk). - /// A DiskPerformanceInfo structure describing the performance - /// information for the given disk. - public static DiskPerformanceInfo QueryDiskPerformanceInfo(SafeFileHandle diskHandle) - { - if (diskHandle.IsInvalid) - throw new ArgumentException("The disk handle must not be invalid."); - - //This only works if the user has turned on the disk performance - //counters with 'diskperf -y'. These counters are off by default - NativeMethods.DiskPerformanceInfoInternal result = - new NativeMethods.DiskPerformanceInfoInternal(); - uint bytesReturned = 0; - if (NativeMethods.DeviceIoControl(diskHandle, NativeMethods.IOCTL_DISK_PERFORMANCE, - IntPtr.Zero, 0, out result, (uint)Marshal.SizeOf(result), out bytesReturned, IntPtr.Zero)) - { - return new DiskPerformanceInfo(result); - } - - return null; - } - } -} Index: /branches/eraser6/CodeReview/Eraser/UpdateForm.cs =================================================================== --- /branches/eraser6/CodeReview/Eraser/UpdateForm.cs (revision 1567) +++ /branches/eraser6/CodeReview/Eraser/UpdateForm.cs (revision 1568) @@ -162,5 +162,5 @@ compatibleArchs.Add("any"); - switch (KernelApi.ProcessorArchitecture) + switch (SystemInfo.ProcessorArchitecture) { case ProcessorArchitecture.Amd64: