Optimised command loop thread - released v1.1.4 (bench 8431417)

Timmoth · Sep 29, 2024 · b8f9d82 · b8f9d82
1 parent fc41d02
commit b8f9d82
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 36 deletions.
diff --git a/.github/workflows/release-pipeline.yaml b/.github/workflows/release-pipeline.yaml
@@ -25,7 +25,7 @@ jobs:
         working-directory: Sapling
         id: get_version
         run: |
-          VERSION=1.1.3
+          VERSION=1.1.4
           echo "Application version: $VERSION"
           echo "::set-output name=version::$VERSION"
 

diff --git a/Sapling/Program.cs b/Sapling/Program.cs
@@ -7,6 +7,10 @@ namespace Sapling;
 
 internal class Program
 {
+    private static readonly ConcurrentQueue<string> commandQueue = new();
+    private static readonly ManualResetEventSlim commandAvailable = new(false);
+    private static bool hasQuit = false;
+
     private static void Main(string[] args)
     {
         if (args.Length > 0 && args[0] == "--version")
@@ -83,42 +87,14 @@ private static void Main(string[] args)
         {
             UciEngine engine = new(logWriter);
 
-            var commandQueue = new ConcurrentQueue<string>();
-
-            var hasQuit = false;
+            // Start the command reading task
             _ = Task.Run(() =>
             {
-                while (true)
-                {
-                    var command = Console.ReadLine();
-                    if (string.IsNullOrEmpty(command))
-                    {
-                        continue;
-                    }
-
-                    if (command.Contains("quit"))
-                    {
-                        hasQuit = true;
-                        break;
-                    }
-
-                    if (command.Contains("stop"))
-                    {
-                        engine.ReceiveCommand(command);
-                        continue;
-                    }
-
-                    commandQueue.Enqueue(command);
-                }
+                ReadCommands(engine);
             });
 
-            while (!hasQuit)
-            {
-                if (commandQueue.TryDequeue(out var command))
-                {
-                    engine.ReceiveCommand(command);
-                }
-            }
+            // Process commands in the main loop
+            ProcessCommands(engine);
         }
         catch (Exception ex)
         {
@@ -132,4 +108,48 @@ private static void Main(string[] args)
             logWriter.Flush();
         }
     }
+
+    private static void ReadCommands(UciEngine engine)
+    {
+        while (true)
+        {
+            var command = Console.ReadLine();
+            if (string.IsNullOrEmpty(command))
+            {
+                continue; // Skip empty commands
+            }
+
+            if (command.Contains("quit", StringComparison.OrdinalIgnoreCase))
+            {
+                hasQuit = true;
+                commandQueue.Enqueue(command);
+                commandAvailable.Set(); // Signal that a command is available
+                break;
+            }
+
+            if (command.Contains("stop", StringComparison.OrdinalIgnoreCase))
+            {
+                // Process the stop command immediately
+                engine.ReceiveCommand(command);
+                continue;
+            }
+
+            commandQueue.Enqueue(command);
+            commandAvailable.Set(); // Signal that a command is available
+        }
+    }
+
+    private static void ProcessCommands(UciEngine engine)
+    {
+        while (!hasQuit)
+        {
+            commandAvailable.Wait(); // Wait until a command is available
+            commandAvailable.Reset(); // Reset the event for the next wait
+
+            while (commandQueue.TryDequeue(out var command))
+            {
+                engine.ReceiveCommand(command);
+            }
+        }
+    }
 }
diff --git a/Sapling/Sapling.csproj b/Sapling/Sapling.csproj
@@ -7,9 +7,9 @@
     <Nullable>enable</Nullable>
     <ApplicationIcon>logo.ico</ApplicationIcon>
     <Title>Sapling</Title>
-	  <AssemblyVersion>1.1.3.0</AssemblyVersion>
-	  <FileVersion>1.1.3.0</FileVersion>
-	  <Version>1.1.3.0</Version>
+	  <AssemblyVersion>1.1.4.0</AssemblyVersion>
+	  <FileVersion>1.1.4.0</FileVersion>
+	  <Version>1.1.4.0</Version>
 	  <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>