Fix performance regression in IPC library from race condition fix

Sparronator9999 · Dec 31, 2024 · 24a1e87 · 24a1e87
1 parent 8b6d26b
commit 24a1e87
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/YAMDCC.IPC/NamedPipeConnection.cs b/YAMDCC.IPC/NamedPipeConnection.cs
@@ -2,6 +2,7 @@
 using System.Collections.Concurrent;
 using System.IO.Pipes;
 using System.Runtime.InteropServices;
+using System.Threading;
 using YAMDCC.IPC.IO;
 using YAMDCC.IPC.Threading;
 
@@ -57,6 +58,7 @@ public class NamedPipeConnection<TRead, TWrite> : IDisposable
 
         private readonly PipeStreamWrapper<TRead, TWrite> _streamWrapper;
 
+        private readonly AutoResetEvent _writeSignal = new(false);
         private readonly BlockingCollection<TWrite> _writeQueue = new();
 
         private bool _notifiedSucceeded;
@@ -82,7 +84,7 @@ internal NamedPipeConnection(int id, string name, PipeStream serverStream)
         /// </param>
         public bool PushMessage(TWrite message)
         {
-            return _writeQueue.TryAdd(message);
+            return _writeQueue.TryAdd(message) && _writeSignal.Set();
         }
 
         /// <summary>
@@ -116,6 +118,7 @@ internal void Close()
         {
             _streamWrapper.Close();
             _writeQueue.CompleteAdding();
+            _writeSignal.Set();
         }
 
         /// <summary>
@@ -169,7 +172,8 @@ private void WritePipe()
         {
             while (IsConnected && _streamWrapper.CanWrite)
             {
-                if (_writeQueue.TryTake(out TWrite obj))
+                _writeSignal.WaitOne();
+                while (_writeQueue.TryTake(out TWrite obj) || _writeQueue.Count > 0)
                 {
                     _streamWrapper.WriteObject(obj);
                     _streamWrapper.WaitForPipeDrain();
@@ -193,6 +197,7 @@ private void Dispose(bool disposing)
             if (disposing)
             {
                 Close();
+                _writeSignal.Dispose();
                 _writeQueue.Dispose();
             }
 

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.1</VersionPrefix>
+        <VersionPrefix>2.1.2</VersionPrefix>
         <VersionSuffix>release</VersionSuffix>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Configuration)'=='Release'">