Manual merge pull request 13

acdvorak#13

NamedPipeWrapper/NamedPipeClient.cs

@@ -1,10 +1,12 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.IO.Pipes;
 using System.Linq;
 using System.Text;
 using System.Threading;
 using NamedPipeWrapper.IO;
+using NamedPipeWrapper.Native;
 using NamedPipeWrapper.Threading;
 
 namespace NamedPipeWrapper
@@ -219,13 +221,40 @@ public static PipeStreamWrapper<TRead, TWrite> Connect<TRead, TWrite>(string pip
         public static NamedPipeClientStream CreateAndConnectPipe(string pipeName, string serverName)
         {
             var pipe = CreatePipe(pipeName, serverName);
-            pipe.Connect();
+            ConnectWithRetry(pipe, Path.GetFullPath($@"\\{serverName}\pipe\{pipeName}"));
             return pipe;
         }
 
         private static NamedPipeClientStream CreatePipe(string pipeName,string serverName)
         {
             return new NamedPipeClientStream(serverName, pipeName, PipeDirection.InOut, PipeOptions.Asynchronous | PipeOptions.WriteThrough);
         }
+
+        private static void ConnectWithRetry(NamedPipeClientStream pipe, string fullPath)
+        {
+            var connected = false;
+            var resetEvent = new ManualResetEvent(false);
+
+            while (!connected)
+            {
+                if (!Kernel32.WaitNamedPipe(fullPath, 0xffffffff))
+                {
+                    resetEvent.WaitOne(100); // prevent cpu spin
+                }
+                else
+                {
+                    try
+                    {
+                        // NamedPipeClientStream.Connect() defaults to a timeout value of -1, which blocks and spins the CPU, provide a sensible timeout value for Connect().
+                        pipe.Connect(15000);
+                        connected = true;
+                    }
+                    catch (TimeoutException)
+                    {
+                        connected = false;
+                    }
+                }
+            }
+        }
     }
 }

NamedPipeWrapper/NamedPipeWrapper.csproj

@@ -45,6 +45,7 @@
     <Compile Include="IO\PipeStreamReader.cs" />
     <Compile Include="IO\PipeStreamWrapper.cs" />
     <Compile Include="IO\PipeStreamWriter.cs" />
+    <Compile Include="Native\Kernel32.cs" />
     <Compile Include="PipeExceptionEventHandler.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="NamedPipeServer.cs" />

NamedPipeWrapper/Native/Kernel32.cs

@@ -0,0 +1,17 @@
+using System.Runtime.InteropServices;
+
+namespace NamedPipeWrapper.Native
+{
+    internal sealed class Kernel32
+    {
+        /// <summary>
+        /// Waits until either a time-out interval elapses or an instance of the specified named pipe is available for connection
+        /// </summary>
+        /// <param name="lpNamedPipeName">The name of the named pipe. The string must include the name of the computer on which the server process is executing.</param>
+        /// <param name="nTimeOut">If no instances of the specified named pipe exist, the WaitNamedPipe function returns immediately, regardless of the time-out value.</param>
+        /// <returns></returns>
+        [return: MarshalAs(UnmanagedType.Bool)]
+        [DllImport("kernel32.dll", CharSet = CharSet.Auto, SetLastError = true)]
+        internal static extern bool WaitNamedPipe(string lpNamedPipeName, uint nTimeOut);
+    }
+}