From 0b98638cd5fc61deac8bf908121d606c05c16dfc Mon Sep 17 00:00:00 2001
From: glax <johanna@bernloehr.eu>
Date: Thu, 16 Jan 2025 22:36:52 +0100
Subject: [PATCH] Less CPU usage by creating tasks per action, instead of
 thread

---
 CShocker.sln.DotSettings.user    |  1 +
 CShocker/CShocker.csproj         |  2 +-
 CShocker/Devices/Abstract/Api.cs | 33 +++++++++++++++++---------------
 3 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/CShocker.sln.DotSettings.user b/CShocker.sln.DotSettings.user
index 5705f12..1b4eec9 100644
--- a/CShocker.sln.DotSettings.user
+++ b/CShocker.sln.DotSettings.user
@@ -1,5 +1,6 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 	<s:Boolean x:Key="/Default/AddReferences/RecentPaths/=C_003A_005CUsers_005CGlax_005CRiderProjects_005CGlaxLogger_005CGlaxLogger_005Cbin_005CDebug_005Cnet7_002E0_005CGlaxLogger_002Edll/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AHttpClient_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003Fc439425da351c75ac7d966a1cc8324b51a9c471865af79d2f2f3fcb65e392_003FHttpClient_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AThrowHelper_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F2c8e7ca976f350cba9836d5565dac56b11e0b56656fa786460eb1395857a6fa_003FThrowHelper_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/Environment/AssemblyExplorer/XmlDocument/@EntryValue">&lt;AssemblyExplorer&gt;&#xD;
   &lt;Assembly Path="C:\Users\Glax\RiderProjects\GlaxLogger\GlaxLogger\bin\Debug\net7.0\GlaxLogger.dll" /&gt;&#xD;
diff --git a/CShocker/CShocker.csproj b/CShocker/CShocker.csproj
index 351d15a..0781cc3 100644
--- a/CShocker/CShocker.csproj
+++ b/CShocker/CShocker.csproj
@@ -6,7 +6,7 @@
         <Authors>Glax</Authors>
         <RepositoryUrl>https://github.com/C9Glax/CShocker</RepositoryUrl>
         <RepositoryType>git</RepositoryType>
-        <Version>3.0.2</Version>
+        <Version>3.1.0</Version>
         <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
         <LangVersion>latestmajor</LangVersion>
         <PackageProjectUrl>https://github.com/C9Glax/CShocker</PackageProjectUrl>
diff --git a/CShocker/Devices/Abstract/Api.cs b/CShocker/Devices/Abstract/Api.cs
index d4552c5..6a710e4 100644
--- a/CShocker/Devices/Abstract/Api.cs
+++ b/CShocker/Devices/Abstract/Api.cs
@@ -10,10 +10,9 @@ public abstract class Api : IDisposable
     // ReSharper disable 4 times MemberCanBePrivate.Global -> Exposed
     protected ILogger? Logger;
     public readonly DeviceApi ApiType;
-    private readonly Queue<ValueTuple<ControlAction, Shocker, int, int>> _queue = new();
-    private bool _workOnQueue = true;
+    private Queue<DateTime> order = new();
+    private Dictionary<DateTime, Task> tasks = new();
     // ReSharper disable once PrivateFieldCanBeConvertedToLocalVariable
-    private readonly Thread _workQueueThread;
     private const short CommandDelay = 50;
     internal readonly IntegerRange ValidIntensityRange, ValidDurationRange;
     
@@ -38,7 +37,12 @@ public abstract class Api : IDisposable
         foreach (Shocker shocker in shockers)
         {
             this.Logger?.Log(LogLevel.Debug, $"Enqueueing {action} Intensity: {intensity} Duration: {duration}\nShocker:\n{shocker}");
-            _queue.Enqueue(new(action, shocker, intensity, duration));
+            ValueTuple<ControlAction, Shocker, int, int> tuple = new(action, shocker, intensity, duration);
+            DateTime now = DateTime.Now;
+            Task t = new (() => ExecuteTask(now, tuple));
+            order.Enqueue(now);
+            tasks.Add(now, t);
+            t.Start();
         }
     }
     
@@ -50,19 +54,17 @@ public abstract class Api : IDisposable
         this.Logger = logger;
         this.ValidIntensityRange = validIntensityRange;
         this.ValidDurationRange = validDurationRange;
-        this._workQueueThread = new Thread(QueueThread);
-        this._workQueueThread.Start();
     }
 
-    private void QueueThread()
+    private void ExecuteTask(DateTime when, ValueTuple<ControlAction, Shocker, int, int> tuple)
     {
-        while (_workOnQueue)
-            if (_queue.Count > 0 && _queue.Dequeue() is { } action)
-            {
-                this.Logger?.Log(LogLevel.Information, $"Executing: {Enum.GetName(action.Item1)} Intensity: {action.Item3} Duration: {action.Item4}\nShocker:\n{action.Item2}");
-                ControlInternal(action.Item1, action.Item2, action.Item3, action.Item4);
-                Thread.Sleep(action.Item4 + CommandDelay);
-            }
+        while (order.First() != when)
+            Thread.Sleep(CommandDelay);
+        this.Logger?.Log(LogLevel.Information, $"Executing: {Enum.GetName(tuple.Item1)} Intensity: {tuple.Item3} Duration: {tuple.Item4}\nShocker:\n{tuple.Item2}");
+        ControlInternal(tuple.Item1, tuple.Item2, tuple.Item3, tuple.Item4);
+        Thread.Sleep(tuple.Item4);
+        tasks.Remove(when);
+        order.Dequeue();
     }
 
     public void SetLogger(ILogger? logger)
@@ -92,6 +94,7 @@ public abstract class Api : IDisposable
 
     public void Dispose()
     {
-        _workOnQueue = false;
+        foreach ((DateTime when, Task? task) in tasks)
+            task?.Dispose();
     }
 }
\ No newline at end of file