Fix potential race condition in IPC message sending function

Hopefully this finally fixes the random EC monitor errors...
Sparronator9999 · Dec 30, 2024 · d2e433c · d2e433c
1 parent 1979f21
commit d2e433c
Show file tree

Hide file tree

Showing 12 changed files with 31 additions and 34 deletions.
diff --git a/YAMDCC.Config/YAMDCC.Config.csproj b/YAMDCC.Config/YAMDCC.Config.csproj
@@ -12,8 +12,8 @@
         <RuntimeIdentifiers>win7-x64;win7-x86;win-x64;win-x86</RuntimeIdentifiers>
         <TargetFramework>net48</TargetFramework>
         <Title>YAMDCC config library</Title>
-        <VersionPrefix>1.0.0.0</VersionPrefix>
-        <VersionSuffix>beta.1</VersionSuffix>
+        <VersionPrefix>1.0.0</VersionPrefix>
+        <VersionSuffix>dev</VersionSuffix>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Configuration)'=='Release'">
         <DebugType>none</DebugType>

diff --git a/YAMDCC.Config/packages.lock.json b/YAMDCC.Config/packages.lock.json
@@ -7,4 +7,4 @@
     ".NETFramework,Version=v4.8/win7-x64": {},
     ".NETFramework,Version=v4.8/win7-x86": {}
   }
-}
+}
diff --git a/YAMDCC.ConfigEditor/YAMDCC.ConfigEditor.csproj b/YAMDCC.ConfigEditor/YAMDCC.ConfigEditor.csproj
@@ -20,8 +20,8 @@
         <TargetFramework>net48</TargetFramework>
         <Title>YAMDCC configuration utility</Title>
         <UseWindowsForms>true</UseWindowsForms>
-        <VersionPrefix>1.0.0.0</VersionPrefix>
-        <VersionSuffix>beta.1</VersionSuffix>
+        <VersionPrefix>1.0.0</VersionPrefix>
+        <VersionSuffix>dev</VersionSuffix>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Configuration)'=='Release'">
         <DebugType>none</DebugType>

diff --git a/YAMDCC.ConfigEditor/packages.lock.json b/YAMDCC.ConfigEditor/packages.lock.json
@@ -104,10 +104,10 @@
       "yamdccsvc": {
         "type": "Project",
         "dependencies": {
-          "YAMDCC.Config": "[1.0.0-beta.1, )",
-          "YAMDCC.ECAccess": "[1.0.0-beta.1, )",
+          "YAMDCC.Config": "[1.0.0-dev, )",
+          "YAMDCC.ECAccess": "[1.0.0-dev, )",
           "YAMDCC.IPC": "[2.1.0-release, )",
-          "YAMDCC.Logs": "[1.0.0-beta.1, )"
+          "YAMDCC.Logs": "[1.0.0-dev, )"
         }
       }
     },
@@ -116,4 +116,4 @@
     ".NETFramework,Version=v4.8/win7-x64": {},
     ".NETFramework,Version=v4.8/win7-x86": {}
   }
-}
+}
diff --git a/YAMDCC.ECAccess/YAMDCC.ECAccess.csproj b/YAMDCC.ECAccess/YAMDCC.ECAccess.csproj
@@ -13,8 +13,8 @@
         <RuntimeIdentifiers>win7-x64;win7-x86;win-x64;win-x86</RuntimeIdentifiers>
         <TargetFramework>net48</TargetFramework>
         <Title>YAMDCC EC access library</Title>
-        <VersionPrefix>1.0.0.0</VersionPrefix>
-        <VersionSuffix>beta.1</VersionSuffix>
+        <VersionPrefix>1.0.0</VersionPrefix>
+        <VersionSuffix>dev</VersionSuffix>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Configuration)'=='Release'">
         <DebugType>none</DebugType>

diff --git a/YAMDCC.ECAccess/packages.lock.json b/YAMDCC.ECAccess/packages.lock.json
@@ -7,4 +7,4 @@
     ".NETFramework,Version=v4.8/win7-x64": {},
     ".NETFramework,Version=v4.8/win7-x86": {}
   }
-}
+}
diff --git a/YAMDCC.IPC/NamedPipeConnection.cs b/YAMDCC.IPC/NamedPipeConnection.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Collections.Generic;
+using System.Collections.Concurrent;
 using System.IO.Pipes;
 using System.Runtime.InteropServices;
 using System.Threading;
@@ -58,8 +58,7 @@ public class NamedPipeConnection<TRead, TWrite> : IDisposable
 
         private readonly PipeStreamWrapper<TRead, TWrite> _streamWrapper;
 
-        private readonly AutoResetEvent _writeSignal = new(false);
-        private readonly Queue<TWrite> _writeQueue = new();
+        private readonly BlockingCollection<TWrite> _writeQueue = new();
 
         private bool _notifiedSucceeded;
 
@@ -82,10 +81,9 @@ internal NamedPipeConnection(int id, string name, PipeStream serverStream)
         /// <param name="message">
         /// The message to write to the named pipe.
         /// </param>
-        public void PushMessage(TWrite message)
+        public bool PushMessage(TWrite message)
         {
-            _writeQueue.Enqueue(message);
-            _writeSignal.Set();
+            return _writeQueue.TryAdd(message);
         }
 
         /// <summary>
@@ -118,7 +116,7 @@ internal void Open()
         internal void Close()
         {
             _streamWrapper.Close();
-            _writeSignal.Set();
+            _writeQueue.CompleteAdding();
         }
 
         /// <summary>
@@ -154,15 +152,14 @@ private void ReadPipe()
             while (IsConnected && _streamWrapper.CanRead)
             {
                 TRead obj = _streamWrapper.ReadObject();
-                if (obj == null)
+                if (obj is null)
                 {
                     Close();
                     return;
                 }
-                PipeMessageEventArgs<TRead, TWrite> e =
-                    new(this, obj);
 
-                ReceiveMessage?.Invoke(this, e);
+                ReceiveMessage?.Invoke(this,
+                    new PipeMessageEventArgs<TRead, TWrite>(this, obj));
             }
         }
 
@@ -173,10 +170,9 @@ private void WritePipe()
         {
             while (IsConnected && _streamWrapper.CanWrite)
             {
-                _writeSignal.WaitOne();
-                while (_writeQueue.Count > 0)
+                if (_writeQueue.TryTake(out TWrite obj))
                 {
-                    _streamWrapper.WriteObject(_writeQueue.Dequeue());
+                    _streamWrapper.WriteObject(obj);
                     _streamWrapper.WaitForPipeDrain();
                 }
             }
@@ -197,7 +193,8 @@ private void Dispose(bool disposing)
 
             if (disposing)
             {
-                _writeSignal.Dispose();
+                Close();
+                _writeQueue.Dispose();
             }
 
             _disposed = true;

diff --git a/YAMDCC.IPC/YAMDCC.IPC.csproj b/YAMDCC.IPC/YAMDCC.IPC.csproj
@@ -12,7 +12,7 @@
         <RuntimeIdentifiers>win7-x64;win7-x86;win-x64;win-x86</RuntimeIdentifiers>
         <TargetFramework>net48</TargetFramework>
         <Title>Named Pipe Wrapper library</Title>
-        <VersionPrefix>2.1.0.0</VersionPrefix>
+        <VersionPrefix>2.1.1</VersionPrefix>
         <VersionSuffix>release</VersionSuffix>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Configuration)'=='Release'">

diff --git a/YAMDCC.Logs/YAMDCC.Logs.csproj b/YAMDCC.Logs/YAMDCC.Logs.csproj
@@ -12,8 +12,8 @@
         <RuntimeIdentifiers>win7-x64;win7-x86;win-x64;win-x86</RuntimeIdentifiers>
         <TargetFramework>net48</TargetFramework>
         <Title>YAMDCC logging library</Title>
-        <VersionPrefix>1.0.0.0</VersionPrefix>
-        <VersionSuffix>beta.1</VersionSuffix>
+        <VersionPrefix>1.0.0</VersionPrefix>
+        <VersionSuffix>dev</VersionSuffix>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Configuration)'=='Release'">
         <DebugType>none</DebugType>

diff --git a/YAMDCC.Logs/packages.lock.json b/YAMDCC.Logs/packages.lock.json
@@ -7,4 +7,4 @@
     ".NETFramework,Version=v4.8/win7-x64": {},
     ".NETFramework,Version=v4.8/win7-x86": {}
   }
-}
+}
diff --git a/YAMDCC.Service/YAMDCC.Service.csproj b/YAMDCC.Service/YAMDCC.Service.csproj
@@ -14,8 +14,8 @@
         <RuntimeIdentifiers>win7-x64;win7-x86;win-x64;win-x86</RuntimeIdentifiers>
         <TargetFramework>net48</TargetFramework>
         <Title>YAMDCC helper service</Title>
-        <VersionPrefix>1.0.0.0</VersionPrefix>
-        <VersionSuffix>beta.1</VersionSuffix>
+        <VersionPrefix>1.0.0</VersionPrefix>
+        <VersionSuffix>dev</VersionSuffix>
         <ApplicationManifest>app.manifest</ApplicationManifest>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Configuration)'=='Release'">

diff --git a/YAMDCC.Service/packages.lock.json b/YAMDCC.Service/packages.lock.json
@@ -107,4 +107,4 @@
     ".NETFramework,Version=v4.8/win7-x64": {},
     ".NETFramework,Version=v4.8/win7-x86": {}
   }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,4 +7,4 @@ @@
         ".NETFramework,Version=v4.8/win7-x64": {},
         ".NETFramework,Version=v4.8/win7-x86": {}
       }
-    }
+    }