Optimization DeviceIO

Author: FanIT

Hardware/Hardware.csproj

@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="LibreHardwareMonitorLib" Version="0.8.9-pre47" />
+    <PackageReference Include="LibreHardwareMonitorLib" Version="0.8.9-pre50" />
   </ItemGroup>
 
   <ItemGroup>

Hardware/Windows/DeviceIoInfo/Device.cs

@@ -1,22 +1,36 @@
-namespace Hardware.Windows.DeviceIoInfo
+using System;
+using DeviceIOControl;
+using DeviceIOControl.Disc;
+
+namespace Hardware.Windows.DeviceIoInfo
 {
-    public class Device
+    public class Device : IDisposable
     {
+        public short Index { get; set; }
         public string Letter { get; set; }
         public VendorEnum Vendor;
         public string Model { get; set; }
-        public byte DeviceID { get; set; }
         public long TotalSpace { get; set; }
         public long FreeSpace { get; set; }
         public long UsedSpace { get; set; }
         public byte PercentUsedSpace { get; set; }
         public float TotalWrite { get; set; }
         public byte Health { get; set; }
         public bool IsSmart { get; set; }
+        public float PrevReadIo { get; set; }
+        public float PrevWriteIo { get; set; }
+        public DeviceIoControl DeviceControl { get; set; }
+        public Performance DevicePerformance { get; set; }
 
         public Device()
         {
             IsSmart = true;
         }
+
+        public void Dispose()
+        {
+            DevicePerformance?.Dispose();
+            DeviceControl?.Dispose();
+        }
     }
 }

Hardware/Windows/DeviceIoInfo/DeviceInfo.cs

@@ -4,74 +4,63 @@
 using System.IO;
 using DeviceIOControl;
 using DeviceIOControl.Native;
-using DeviceIOControl.Disc;
 using DeviceIOControl.Disc.Smart;
 
 namespace Hardware.Windows.DeviceIoInfo
 {
     public static class DeviceInfo
     {
-        public static float ReadIO { get; private set; }
-        public static float WriteIO { get; private set; }
+        public static float ReadIo { get; private set; }
+        public static float WriteIo { get; private set; }
 
         public static List<Device> LogicalDrives { get; }
-        private static Dictionary<string, DeviceIoControl> _deviceIoList;
 
-        private static Performance[] _perfomances;
-        private static float[] _prevReadValues;
-        private static float[] _prevWriteValues;
-
         static DeviceInfo()
         {
             LogicalDrives = new();
-            _deviceIoList = new();
         }
 
         private static void SetDiscCollection()
         {
-            LogicalDrives.Clear();
-            _deviceIoList.Clear();
+            Close();
 
             IEnumerable<LogicalDrive> logicalDevicesIo = DeviceIoControl.GetLogicalDrives();
 
+            short devIndex = 0;
+            
             foreach (LogicalDrive logical in logicalDevicesIo)
             {
                 if (logical.Type != WinApi.DRIVE.FIXED) 
                     continue;
 
-                Device device = new();
-                device.Letter = logical.Name;
+                Device device = new()
+                {
+                    Index = devIndex,
+                    Letter = logical.Name,
+                    DeviceControl = new DeviceIoControl(logical.Name)
+                };
+                device.DevicePerformance = device.DeviceControl.Disc.GetDiscPerformance();
 
                 LogicalDrives.Add(device);
-                _deviceIoList.Add(device.Letter, new DeviceIoControl(device.Letter));
-            }
-
-            byte index = 0;
-
-            _prevReadValues = new float[LogicalDrives.Count];
-            _prevWriteValues = new float[LogicalDrives.Count];
-            _perfomances = new Performance[LogicalDrives.Count];
 
+                devIndex++;
+            }
+            
             foreach (Device dev in LogicalDrives)
             {
-                var smart = _deviceIoList[dev.Letter].Disc.Smart;
+                SmartInfoCollection smart = dev.DeviceControl.Disc.Smart;
 
-                if (smart != null) dev.Model = smart.SystemParams.ModelNumber.Trim(' ');
-                else dev.Model = new DriveInfo(dev.Letter).VolumeLabel;
+                dev.Model = smart != null ? smart.SystemParams.ModelNumber.Trim(' ') : new DriveInfo(dev.Letter).VolumeLabel;
 
                 if (dev.Model.Contains("samsung", StringComparison.OrdinalIgnoreCase)) dev.Vendor = VendorEnum.Samsung;
                 else if (dev.Model.Contains("kingston", StringComparison.OrdinalIgnoreCase)) dev.Vendor = VendorEnum.Kingston;
                 else if (dev.Model.Contains("wdc", StringComparison.OrdinalIgnoreCase)) dev.Vendor = VendorEnum.WDC;
                 else dev.Vendor = VendorEnum.Other;
 
-                _perfomances[index] = _deviceIoList[dev.Letter].Disc.GetDiscPerformance();
-
-                DiscApi.DISK_PERFORMANCE diskPerformance = _perfomances[index].QueryPerformanceInfo();
+                DiscApi.DISK_PERFORMANCE diskPerformance = dev.DevicePerformance.QueryPerformanceInfo();
 
-                _prevReadValues[index] = diskPerformance.BytesRead;
-                _prevWriteValues[index] = diskPerformance.BytesWritten;
-
-                index++;
+                dev.PrevReadIo = diskPerformance.BytesRead;
+                dev.PrevWriteIo = diskPerformance.BytesWritten;
             }
         }
 
@@ -90,7 +79,7 @@ public static bool IsUpdateDiscs()
         public static void UpdateSizeOfDiscs()
         {
             if (LogicalDrives == null) SetDiscCollection();
-
+            
             foreach (Device logic in LogicalDrives)
             {
                 DriveInfo drive = new(logic.Letter);
@@ -112,54 +101,50 @@ public static void UpdateInfoOfDiscs()
         {
             if (LogicalDrives == null) SetDiscCollection();
 
-            foreach (Device logical in LogicalDrives)
+            foreach (Device dev in LogicalDrives)
             {
-                SmartInfoCollection smart = _deviceIoList[logical.Letter].Disc.Smart;
+                SmartInfoCollection smart = dev.DeviceControl.Disc.Smart;
+
+                if (smart == null) continue;
+
+                DiscApi.DRIVEATTRIBUTE[] driveAttributes = smart.GetAttributes();
 
-                if (smart != null)
+                foreach (DiscApi.DRIVEATTRIBUTE attribute in driveAttributes)
                 {
-                    DiscApi.DRIVEATTRIBUTE[] driveAttributes = smart.GetAttributes();
+                    if (dev.Vendor == VendorEnum.Samsung)
+                    {
+                        if (attribute.bAttrID == 177) dev.Health = attribute.bAttrValue;
+                        if (attribute.bAttrID == 241) dev.TotalWrite = attribute.RawValue / (float)int.MaxValue;
+                    }
 
-                    foreach (DiscApi.DRIVEATTRIBUTE attribute in driveAttributes)
+                    if (dev.Vendor == VendorEnum.Kingston)
                     {
-                        if (logical.Vendor == VendorEnum.Samsung)
-                        {
-                            if (attribute.bAttrID == 177) logical.Health = attribute.bAttrValue;
-                            if (attribute.bAttrID == 241) logical.TotalWrite = attribute.RawValue / (float)int.MaxValue;
-                        }
-
-                        if (logical.Vendor == VendorEnum.Kingston)
-                        {
-                            if (attribute.bAttrID == 231) logical.Health = attribute.bAttrValue;
-                            if (attribute.bAttrID == 241) logical.TotalWrite = attribute.RawValue / 1024f;
-                        }
+                        if (attribute.bAttrID == 231) dev.Health = attribute.bAttrValue;
+                        if (attribute.bAttrID == 241) dev.TotalWrite = attribute.RawValue / 1024f;
                     }
                 }
             }
         }
 
-        public static void PerfomanceDiskUpdate(byte index)
+        public static void PerfomanceDiskUpdate(short index)
         {
-            DiscApi.DISK_PERFORMANCE dISK_PERFORMANCE = _perfomances[index].QueryPerformanceInfo();
+            DiscApi.DISK_PERFORMANCE dIskPerformance = LogicalDrives[index].DevicePerformance.QueryPerformanceInfo();
 
-            ReadIO = (dISK_PERFORMANCE.BytesRead - _prevReadValues[index]) / 1000000;
-            WriteIO = (dISK_PERFORMANCE.BytesWritten - _prevWriteValues[index]) / 1000000;
+            ReadIo = (dIskPerformance.BytesRead - LogicalDrives[index].PrevReadIo) / 1000000;
+            WriteIo = (dIskPerformance.BytesWritten - LogicalDrives[index].PrevWriteIo) / 1000000;
 
-            _prevReadValues[index] = dISK_PERFORMANCE.BytesRead;
-            _prevWriteValues[index] = dISK_PERFORMANCE.BytesWritten;
+            LogicalDrives[index].PrevReadIo = dIskPerformance.BytesRead;
+            LogicalDrives[index].PrevWriteIo = dIskPerformance.BytesWritten;
         }
 
         public static void Close()
         {
-            foreach (Performance performance in _perfomances)
-            {
-                performance?.Dispose();
-            }
-
-            foreach (DeviceIoControl device in _deviceIoList.Values)
+            foreach (Device dev in LogicalDrives)
             {
-                device.Dispose();
+                dev.Dispose();
             }
+            
+            LogicalDrives.Clear();
         }
     }
 }

SysMonAvalonia/Data/DeviceIoData.cs

@@ -18,6 +18,8 @@ public class DeviceIoData : ReactiveObject
         private float _readIO;
         private readonly ChartModel _chartModel = new();
 
+        public short Index { get; set; }
+
         public string Model
         {
             get => _model;

SysMonAvalonia/Models/ChartModel.cs

@@ -16,7 +16,7 @@ public class ChartModel
         public ISeries[] Series { get; set; }
         public Axis[] XAxis { get; set; }
         public Axis[] YAxis { get; set; }
-        public SolidColorPaint Fill { 
+        public SolidColorPaint? Fill { 
             set => _lineSeries.Fill = value;
         }
         public double Value

SysMonAvalonia/Models/DeviceIoModel.cs

@@ -2,7 +2,9 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.IO;
+using System.Linq;
 using System.Reactive.Linq;
+using Avalonia;
 using Avalonia.Controls;
 using DynamicData;
 using Hardware.Windows.DeviceIoInfo;
@@ -39,9 +41,10 @@ public void UpdateDeviceCollection()
                     if (ExistDeviceInCollection(dev)) continue;
 
                     DeviceIoData device = new();
+                    device.Index = dev.Index;
                     device.Model = dev.Model;
                     device.Letter = dev.Letter;
-                    device.DeviceChart.Fill = App.Current.FindResource("DeviceChartFill") as SolidColorPaint;
+                    device.DeviceChart.Fill = Application.Current.FindResource("DeviceChartFill") as SolidColorPaint;
 
                     _deviceList.Add(device);
                 }
@@ -59,20 +62,12 @@ public void UpdateDeviceSpace()
                 UpdateDeviceCollection();
                 DeviceInfo.UpdateSizeOfDiscs();
             }
-
+            
             foreach (DeviceIoData devData in _deviceList.Items)
             {
-                foreach (Device dev in DeviceInfo.LogicalDrives)
-                {
-                    if (devData.Letter.Contains(dev.Letter))
-                    {
-                        devData.TotalSize = dev.TotalSpace;
-                        devData.UsedSize = dev.UsedSpace;
-                        devData.PercentUsed = dev.PercentUsedSpace;
-                        
-                        break;
-                    }
-                }
+                devData.TotalSize = DeviceInfo.LogicalDrives[devData.Index].TotalSpace;
+                devData.UsedSize = DeviceInfo.LogicalDrives[devData.Index].UsedSpace;
+                devData.PercentUsed = DeviceInfo.LogicalDrives[devData.Index].PercentUsedSpace;
             }
         }
 
@@ -82,66 +77,40 @@ public void UpdateDeviceInfo()
 
             foreach (DeviceIoData devData in _deviceList.Items)
             {
-                foreach (Device dev in DeviceInfo.LogicalDrives)
-                {
-                    if (devData.Letter.Contains(dev.Letter))
-                    {
-                        devData.Health = dev.Health;
-                        devData.TotalWrite = dev.TotalWrite;
-
-                        devData.IsHealth = dev.Health != 0;
-                        devData.IsTotalWrite = dev.TotalWrite != 0;
-                    }
-                }
+                devData.Health = DeviceInfo.LogicalDrives[devData.Index].Health;
+                devData.TotalWrite = DeviceInfo.LogicalDrives[devData.Index].TotalWrite;
+
+                devData.IsHealth = devData.Health != 0;
+                devData.IsTotalWrite = devData.TotalWrite != 0;
             }
         }
 
         public void UpdatePerformance()
         {
-            byte count = 0;
-            
             foreach (DeviceIoData dId in _deviceList.Items)
             {
-                DeviceInfo.PerfomanceDiskUpdate(count);
+                DeviceInfo.PerfomanceDiskUpdate(dId.Index);
 
-                dId.ReadIO = DeviceInfo.ReadIO;
-                dId.WriteIO = DeviceInfo.WriteIO;
-                dId.DeviceChart.Value = DeviceInfo.ReadIO + DeviceInfo.WriteIO;
-                
-                count++;
+                dId.ReadIO = DeviceInfo.ReadIo;
+                dId.WriteIO = DeviceInfo.WriteIo;
+                dId.DeviceChart.Value = DeviceInfo.ReadIo + DeviceInfo.WriteIo;
             }
         }
 
         private bool ExistDeviceInCollection(Device device)
         {
-            foreach (DeviceIoData dID in _deviceList.Items)
-            {
-                if (dID.Model.Contains(device.Model) && dID.TotalSize == device.TotalSpace)
-                    return true;
-            }
-
-            return false;
+            return _deviceList.Items.Any(did => did.Model.Contains(device.Model) && did.TotalSize == device.TotalSpace);
         }
 
-        private void RemoveOldDeviceInCollection(List<Device> device)
+        private void RemoveOldDeviceInCollection(IReadOnlyCollection<Device> device)
         {
-            byte index = 0;
+            short index = 0;
 
             foreach (DeviceIoData item in _deviceList.Items)
             {
-                bool isExist = false;
-
-                foreach (Device dev in device)
-                {
-                    if (dev.Model.Contains(item.Model) && dev.TotalSpace == item.TotalSize)
-                    {
-                        isExist = true;
-                        break;
-                    }
-                }
-
-                if (!isExist) _deviceList.RemoveAt(index);
-
+                if (!device.Any(dev => dev.Model.Contains(item.Model) && dev.TotalSpace == item.TotalSize))
+                    _deviceList.RemoveAt(index);
+                
                 index++;
             }
         }

SysMonAvalonia/SysMonAvalonia.csproj

@@ -27,8 +27,8 @@
     <PackageReference Include="Avalonia.Xaml.Behaviors" Version="0.10.8" />
     <PackageReference Include="LiveChartsCore.SkiaSharpView.Avalonia" Version="2.0.0-beta.71" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="Projektanker.Icons.Avalonia" Version="3.1.2" />
-    <PackageReference Include="Projektanker.Icons.Avalonia.FontAwesome" Version="3.1.2" />
+    <PackageReference Include="Projektanker.Icons.Avalonia" Version="3.2.0" />
+    <PackageReference Include="Projektanker.Icons.Avalonia.FontAwesome" Version="3.2.0" />
     <PackageReference Include="TaskScheduler" Version="2.9.2" />
   </ItemGroup>
   <ItemGroup>