Use UnixCancellationPipe in UnixTerminalWriter too.

Author: alexrp

src/core/Terminals/Unix/UnixCancellationPipe.cs

@@ -5,17 +5,17 @@ namespace Vezel.Cathode.Terminals.Unix;
 [SuppressMessage("", "CA1001")]
 internal sealed class UnixCancellationPipe
 {
-    private readonly UnixVirtualTerminal _terminal;
-
     private readonly AnonymousPipeServerStream _server;
 
     private readonly AnonymousPipeClientStream _client;
 
-    public UnixCancellationPipe(UnixVirtualTerminal terminal)
+    private readonly bool _write;
+
+    public UnixCancellationPipe(bool write)
     {
-        _terminal = terminal;
         _server = new(PipeDirection.Out);
         _client = new(PipeDirection.In, _server.ClientSafePipeHandle);
+        _write = write;
     }
 
     public unsafe void PollWithCancellation(nuint handle, CancellationToken cancellationToken)
@@ -38,7 +38,7 @@ public unsafe void PollWithCancellation(nuint handle, CancellationToken cancella
 
             using (var registration = cancellationToken.UnsafeRegister(
                 static @this => Unsafe.As<UnixCancellationPipe>(@this!)._server.WriteByte(42), this))
-                TerminalInterop.Poll(write: false, handles, results, count: 2);
+                TerminalInterop.Poll(_write, handles, results, count: 2);
 
             // Were we canceled?
             if (results[0])

src/core/Terminals/Unix/UnixTerminalReader.cs

@@ -4,16 +4,14 @@ namespace Vezel.Cathode.Terminals.Unix;
 
 internal sealed class UnixTerminalReader : NativeTerminalReader
 {
-    private readonly SemaphoreSlim _semaphore;
+    private readonly UnixCancellationPipe _cancellationPipe = new(write: false);
 
-    private readonly UnixCancellationPipe _cancellationPipe;
+    private readonly SemaphoreSlim _semaphore;
 
-    public UnixTerminalReader(
-        UnixVirtualTerminal terminal, nuint handle, UnixCancellationPipe cancellationPipe, SemaphoreSlim semaphore)
+    public UnixTerminalReader(UnixVirtualTerminal terminal, nuint handle, SemaphoreSlim semaphore)
         : base(terminal, handle)
     {
         _semaphore = semaphore;
-        _cancellationPipe = cancellationPipe;
     }
 
     protected override unsafe int ReadPartialNative(scoped Span<byte> buffer, CancellationToken cancellationToken)

src/core/Terminals/Unix/UnixTerminalWriter.cs

@@ -4,6 +4,8 @@ namespace Vezel.Cathode.Terminals.Unix;
 
 internal sealed class UnixTerminalWriter : NativeTerminalWriter
 {
+    private readonly UnixCancellationPipe _cancellationPipe = new(write: true);
+
     private readonly SemaphoreSlim _semaphore;
 
     public UnixTerminalWriter(UnixVirtualTerminal terminal, nuint handle, SemaphoreSlim semaphore)
@@ -23,6 +25,8 @@ protected override unsafe int WritePartialNative(scoped ReadOnlySpan<byte> buffe
 
         using (_semaphore.Enter(cancellationToken))
         {
+            _cancellationPipe.PollWithCancellation(Handle, cancellationToken);
+
             int progress;
 
             fixed (byte* p = buffer)

src/core/Terminals/Unix/UnixVirtualTerminal.cs

@@ -59,7 +59,7 @@ void HandleSignal(PosixSignalContext context)
 
     protected override UnixTerminalReader CreateReader(nuint handle, SemaphoreSlim semaphore)
     {
-        return new(this, handle, new(this), semaphore);
+        return new(this, handle, semaphore);
     }
 
     protected override UnixTerminalWriter CreateWriter(nuint handle, SemaphoreSlim semaphore)