Address PR feedback

Author: Maxwe11

src/System.IO.Pipes/src/System.IO.Pipes.csproj

@@ -132,8 +132,8 @@
     <Compile Include="System\IO\Pipes\NamedPipeClientStream.Windows.cs" />
     <Compile Include="System\IO\Pipes\NamedPipeServerStream.Windows.cs" />
     <Compile Include="System\IO\Pipes\PipeCompletionSource.cs" />
-    <Compile Include="System\IO\Pipes\PipeIOCompletionSource.cs" />
     <Compile Include="System\IO\Pipes\PipeStream.Windows.cs" />
+    <Compile Include="System\IO\Pipes\ReadWriteCompletionSource.cs" />
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetsUnix)' == 'true' ">
     <Compile Include="Microsoft\Win32\SafeHandles\SafePipeHandle.Unix.cs" />

src/System.IO.Pipes/src/System/IO/Pipes/ConnectionCompletionSource.cs

@@ -33,9 +33,9 @@ protected override void AsyncCallback(uint errorCode, uint numBytes)
             base.AsyncCallback(errorCode, numBytes);
         }
 
-        protected override void HandleError()
+        protected override void HandleError(int errorCode)
         {
-            TrySetException(Win32Marshal.GetExceptionForWin32Error(ErrorCode));
+            TrySetException(Win32Marshal.GetExceptionForWin32Error(errorCode));
         }
     }
 

src/System.IO.Pipes/src/System/IO/Pipes/PipeCompletionSource.cs

@@ -21,6 +21,7 @@ internal abstract unsafe class PipeCompletionSource<TResult> : TaskCompletionSou
         private readonly ThreadPoolBoundHandle _threadPoolBinding;
 
         private CancellationTokenRegistration _cancellationRegistration;
+        private int _errorCode;
         private NativeOverlapped* _overlapped;
         private int _state;
 
@@ -52,8 +53,6 @@ internal NativeOverlapped* Overlapped
             [SecurityCritical]get { return _overlapped; }
         }
 
-        protected int ErrorCode { get; private set; }
-
         internal void RegisterForCancellation()
         {
 #if DEBUG
@@ -83,7 +82,7 @@ internal void RegisterForCancellation()
 
                 // If we have the result state of completed IO call CompleteCallback(result).
                 // Otherwise IO not completed.
-                if (state == ResultSuccess || state == ResultError)
+                if ((state & (ResultSuccess | ResultError)) != 0)
                 {
                     CompleteCallback(state);
                 }
@@ -107,9 +106,16 @@ internal void ReleaseResources()
 
         protected virtual void AsyncCallback(uint errorCode, uint numBytes)
         {
-            ErrorCode = (int)errorCode;
-
-            int resultState = errorCode == 0 ? ResultSuccess : ResultError;
+            int resultState;
+            if (errorCode == 0)
+            {
+                resultState = ResultSuccess;
+            }
+            else
+            {
+                resultState = ResultError;
+                _errorCode = (int)errorCode;
+            }
 
             // Store the result so that other threads can observe it
             // and if no other thread is registering cancellation, continue.
@@ -125,24 +131,21 @@ protected virtual void AsyncCallback(uint errorCode, uint numBytes)
             }
         }
 
-        protected abstract void HandleError();
+        protected abstract void HandleError(int errorCode);
 
         private void Cancel()
         {
             SafeHandle handle = _threadPoolBinding.Handle;
             NativeOverlapped* overlapped = Overlapped;
 
             // If the handle is still valid, attempt to cancel the IO
-            if (!handle.IsInvalid)
+            if (!handle.IsInvalid && !Interop.mincore.CancelIoEx(handle, overlapped))
             {
-                if (!Interop.mincore.CancelIoEx(handle, overlapped))
-                {
-                    // This case should not have any consequences although
-                    // it will be easier to debug if there exists any special case
-                    // we are not aware of.
-                    int errorCode = Marshal.GetLastWin32Error();
-                    Debug.WriteLine("CancelIoEx finished with error code {0}.", errorCode);
-                }
+                // This case should not have any consequences although
+                // it will be easier to debug if there exists any special case
+                // we are not aware of.
+                int errorCode = Marshal.GetLastWin32Error();
+                Debug.WriteLine("CancelIoEx finished with error code {0}.", errorCode);
             }
         }
 
@@ -154,7 +157,7 @@ private void CompleteCallback(int resultState)
 
             if (resultState == ResultError)
             {
-                if (ErrorCode == Interop.mincore.Errors.ERROR_OPERATION_ABORTED)
+                if (_errorCode == Interop.mincore.Errors.ERROR_OPERATION_ABORTED)
                 {
                     if (_cancellationToken.CanBeCanceled && !_cancellationToken.IsCancellationRequested)
                     {
@@ -169,7 +172,7 @@ private void CompleteCallback(int resultState)
                 }
                 else
                 {
-                    HandleError();
+                    HandleError(_errorCode);
                 }
             }
             else

src/System.IO.Pipes/src/System/IO/Pipes/PipeStream.Windows.cs

@@ -312,7 +312,7 @@ private Task WriteAsyncCorePrivate(byte[] buffer, int offset, int count, Cancell
             }
             else
             {
-                var completionSource = new PipeIOCompletionSource(this, buffer, cancellationToken, isWrite: true);
+                var completionSource = new ReadWriteCompletionSource(this, buffer, cancellationToken, isWrite: true);
                 int errorCode = 0;
 
                 // Queue an async WriteFile operation and pass in a packed overlapped
@@ -462,7 +462,7 @@ private Task<int> ReadAsyncCorePrivate(byte[] buffer, int offset, int count, Can
             }
             else
             {
-                var completionSource = new PipeIOCompletionSource(this, buffer, cancellationToken, isWrite: false);
+                var completionSource = new ReadWriteCompletionSource(this, buffer, cancellationToken, isWrite: false);
 
                 // Queue an async ReadFile operation and pass in a packed overlapped
                 int errorCode = 0;

src/System.IO.Pipes/src/System/IO/Pipes/PipeIOCompletionSource.cs renamed to src/System.IO.Pipes/src/System/IO/Pipes/ReadWriteCompletionSource.cs

@@ -6,23 +6,22 @@
 
 namespace System.IO.Pipes
 {
-    internal sealed class PipeIOCompletionSource : PipeCompletionSource<int>
+    internal sealed class ReadWriteCompletionSource : PipeCompletionSource<int>
     {
         private readonly bool _isWrite;
         private readonly PipeStream _pipeStream;
 
         private bool _isMessageComplete;
         private int _numBytes; // number of buffer read OR written
 
-        internal PipeIOCompletionSource(PipeStream stream, byte[] buffer, CancellationToken cancellationToken, bool isWrite)
+        internal ReadWriteCompletionSource(PipeStream stream, byte[] buffer, CancellationToken cancellationToken, bool isWrite)
             : base(stream._threadPoolBinding, cancellationToken, pinData: buffer)
         {
             Debug.Assert(buffer != null, "buffer is null");
 
             _pipeStream = stream;
             _isWrite = isWrite;
             _isMessageComplete = true;
-            _numBytes = 0;
         }
 
         internal override void SetCompletedSynchronously()
@@ -66,9 +65,9 @@ protected override void AsyncCallback(uint errorCode, uint numBytes)
             base.AsyncCallback(errorCode, numBytes);
         }
 
-        protected override void HandleError()
+        protected override void HandleError(int errorCode)
         {
-            TrySetException(_pipeStream.WinIOError(ErrorCode));
+            TrySetException(_pipeStream.WinIOError(errorCode));
         }
     }
 }