From 5cfda7737f69864e9ab639e083428f239d672dfb Mon Sep 17 00:00:00 2001
From: Krzysztof Wicher <kwicher@microsoft.com>
Date: Tue, 12 May 2020 10:25:43 -0700
Subject: [PATCH] make Poll enums shared

---
 .../src/Interop/Unix/Interop.Poll.Structs.cs       | 28 +++++++++++++++
 .../src/Interop/Unix/System.Native/Interop.Poll.cs | 19 ----------
 .../System.Console/src/System.Console.csproj       |  2 ++
 .../System.Console/src/System/ConsolePal.Unix.cs   |  2 +-
 .../src/System.IO.FileSystem.Watcher.csproj        |  2 ++
 .../src/System/IO/FileSystemWatcher.Linux.cs       |  6 ++--
 .../System.IO.Pipes/src/System.IO.Pipes.csproj     |  2 --
 .../src/Interop/Unix/Interop.Serial.cs             | 19 ----------
 .../System.IO.Ports/src/System.IO.Ports.csproj     |  2 ++
 .../src/System/IO/Ports/SerialStream.Unix.cs       | 20 +++++------
 .../System.Net.Http/src/System.Net.Http.csproj     |  2 ++
 .../src/System.Net.Sockets.csproj                  |  2 ++
 .../src/System/Net/Sockets/SocketPal.Unix.cs       | 42 +++++++++++-----------
 13 files changed, 73 insertions(+), 75 deletions(-)
 create mode 100644 src/libraries/Common/src/Interop/Unix/Interop.Poll.Structs.cs

diff --git a/src/libraries/Common/src/Interop/Unix/Interop.Poll.Structs.cs b/src/libraries/Common/src/Interop/Unix/Interop.Poll.Structs.cs
new file mode 100644
index 0000000..34ca249
--- /dev/null
+++ b/src/libraries/Common/src/Interop/Unix/Interop.Poll.Structs.cs
@@ -0,0 +1,28 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Runtime.InteropServices;
+
+internal static partial class Interop
+{
+    [Flags]
+    internal enum PollEvents : short
+    {
+        POLLNONE = 0x0000,  // No events occurred.
+        POLLIN   = 0x0001,  // non-urgent readable data available
+        POLLPRI  = 0x0002,  // urgent readable data available
+        POLLOUT  = 0x0004,  // data can be written without blocked
+        POLLERR  = 0x0008,  // an error occurred
+        POLLHUP  = 0x0010,  // the file descriptor hung up
+        POLLNVAL = 0x0020,  // the requested events were invalid
+    }
+
+    internal struct PollEvent
+    {
+        internal int FileDescriptor;         // The file descriptor to poll
+        internal PollEvents Events;          // The events to poll for
+        internal PollEvents TriggeredEvents; // The events that occurred which triggered the poll
+    }
+}
diff --git a/src/libraries/Common/src/Interop/Unix/System.Native/Interop.Poll.cs b/src/libraries/Common/src/Interop/Unix/System.Native/Interop.Poll.cs
index 5496172..895ce72 100644
--- a/src/libraries/Common/src/Interop/Unix/System.Native/Interop.Poll.cs
+++ b/src/libraries/Common/src/Interop/Unix/System.Native/Interop.Poll.cs
@@ -10,25 +10,6 @@ internal static partial class Interop
 {
     internal static partial class Sys
     {
-        [Flags]
-        internal enum PollEvents : short
-        {
-            POLLNONE = 0x0000,  // No events occurred.
-            POLLIN   = 0x0001,  // non-urgent readable data available
-            POLLPRI  = 0x0002,  // urgent readable data available
-            POLLOUT  = 0x0004,  // data can be written without blocked
-            POLLERR  = 0x0008,  // an error occurred
-            POLLHUP  = 0x0010,  // the file descriptor hung up
-            POLLNVAL = 0x0020,  // the requested events were invalid
-        }
-
-        internal struct PollEvent
-        {
-            internal int FileDescriptor;         // The file descriptor to poll
-            internal PollEvents Events;          // The events to poll for
-            internal PollEvents TriggeredEvents; // The events that occurred which triggered the poll
-        }
-
         /// <summary>
         /// Polls a set of file descriptors for signals and returns what signals have been set
         /// </summary>
diff --git a/src/libraries/System.Console/src/System.Console.csproj b/src/libraries/System.Console/src/System.Console.csproj
index 4336824..23b21f1 100644
--- a/src/libraries/System.Console/src/System.Console.csproj
+++ b/src/libraries/System.Console/src/System.Console.csproj
@@ -194,6 +194,8 @@
              Link="Common\Interop\Unix\Interop.OpenFlags.cs" />
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.Poll.cs"
              Link="Common\Interop\Unix\Interop.Poll.cs" />
+    <Compile Include="$(CommonPath)Interop\Unix\Interop.Poll.Structs.cs"
+             Link="Common\Interop\Unix\Interop.Poll.Structs.cs" />
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.GetEUid.cs"
              Link="Common\Interop\Unix\Interop.GetEUid.cs" />
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.GetPwUid.cs"
diff --git a/src/libraries/System.Console/src/System/ConsolePal.Unix.cs b/src/libraries/System.Console/src/System/ConsolePal.Unix.cs
index ff7efd5..f3ac90a 100644
--- a/src/libraries/System.Console/src/System/ConsolePal.Unix.cs
+++ b/src/libraries/System.Console/src/System/ConsolePal.Unix.cs
@@ -1279,7 +1279,7 @@ namespace System
                         // only the blocking behavior, and thus ignore any poll errors
                         // and loop around to do another write (which may correctly fail
                         // if something else has gone wrong).
-                        Interop.Sys.Poll(fd, Interop.Sys.PollEvents.POLLOUT, Timeout.Infinite, out Interop.Sys.PollEvents triggered);
+                        Interop.Sys.Poll(fd, Interop.PollEvents.POLLOUT, Timeout.Infinite, out Interop.PollEvents triggered);
                         continue;
                     }
                     else
diff --git a/src/libraries/System.IO.FileSystem.Watcher/src/System.IO.FileSystem.Watcher.csproj b/src/libraries/System.IO.FileSystem.Watcher/src/System.IO.FileSystem.Watcher.csproj
index 300a25a..5872cdf 100644
--- a/src/libraries/System.IO.FileSystem.Watcher/src/System.IO.FileSystem.Watcher.csproj
+++ b/src/libraries/System.IO.FileSystem.Watcher/src/System.IO.FileSystem.Watcher.csproj
@@ -66,6 +66,8 @@
              Link="Common\Interop\Linux\Interop.inotify.cs" />
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.Poll.cs"
              Link="Common\Interop\Unix\Interop.Poll.cs" />
+    <Compile Include="$(CommonPath)Interop\Unix\Interop.Poll.Structs.cs"
+             Link="Common\Interop\Unix\Interop.Poll.Structs.cs" />
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.Stat.cs"
              Link="Common\Interop\Unix\Interop.Stat.cs" />
   </ItemGroup>
diff --git a/src/libraries/System.IO.FileSystem.Watcher/src/System/IO/FileSystemWatcher.Linux.cs b/src/libraries/System.IO.FileSystem.Watcher/src/System/IO/FileSystemWatcher.Linux.cs
index def4ae5..5b04282 100644
--- a/src/libraries/System.IO.FileSystem.Watcher/src/System/IO/FileSystemWatcher.Linux.cs
+++ b/src/libraries/System.IO.FileSystem.Watcher/src/System/IO/FileSystemWatcher.Linux.cs
@@ -680,11 +680,11 @@ namespace System.IO
                                     // that's actually what's needed (otherwise it'd be fine to block indefinitely waiting
                                     // for the next event to arrive).
                                     const int MillisecondsTimeout = 2;
-                                    Interop.Sys.PollEvents events;
-                                    Interop.Sys.Poll(_inotifyHandle, Interop.Sys.PollEvents.POLLIN, MillisecondsTimeout, out events);
+                                    Interop.PollEvents events;
+                                    Interop.Sys.Poll(_inotifyHandle, Interop.PollEvents.POLLIN, MillisecondsTimeout, out events);
 
                                     // If we error or don't have any signaled handles, send the deleted event
-                                    if (events == Interop.Sys.PollEvents.POLLNONE)
+                                    if (events == Interop.PollEvents.POLLNONE)
                                     {
                                         // There isn't any more data in the queue so this is a deleted event
                                         watcher.NotifyFileSystemEventArgs(WatcherChangeTypes.Deleted, expandedName);
diff --git a/src/libraries/System.IO.Pipes/src/System.IO.Pipes.csproj b/src/libraries/System.IO.Pipes/src/System.IO.Pipes.csproj
index ee5dd28..9c2991a 100644
--- a/src/libraries/System.IO.Pipes/src/System.IO.Pipes.csproj
+++ b/src/libraries/System.IO.Pipes/src/System.IO.Pipes.csproj
@@ -151,8 +151,6 @@
              Link="Common\Interop\Unix\Interop.Permissions.cs" />
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.Pipe.cs"
              Link="Common\Interop\Unix\Interop.Pipe.cs" />
-    <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.Poll.cs"
-             Link="Common\Interop\Unix\Interop.Poll.cs" />
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.Read.Pipe.cs"
              Link="Common\Interop\Unix\Interop.Read.Pipe.cs" />
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.Unlink.cs"
diff --git a/src/libraries/System.IO.Ports/src/Interop/Unix/Interop.Serial.cs b/src/libraries/System.IO.Ports/src/Interop/Unix/Interop.Serial.cs
index 44264a5..35e8040 100644
--- a/src/libraries/System.IO.Ports/src/Interop/Unix/Interop.Serial.cs
+++ b/src/libraries/System.IO.Ports/src/Interop/Unix/Interop.Serial.cs
@@ -12,25 +12,6 @@ internal static partial class Interop
 {
     internal static partial class Serial
     {
-        [Flags]
-        internal enum PollEvents : short
-        {
-            POLLNONE = 0x0000,  // No events occurred.
-            POLLIN   = 0x0001,  // non-urgent readable data available
-            POLLPRI  = 0x0002,  // urgent readable data available
-            POLLOUT  = 0x0004,  // data can be written without blocked
-            POLLERR  = 0x0008,  // an error occurred
-            POLLHUP  = 0x0010,  // the file descriptor hung up
-            POLLNVAL = 0x0020,  // the requested events were invalid
-        }
-
-        internal struct PollEvent
-        {
-            internal int FileDescriptor;         // The file descriptor to poll
-            internal PollEvents Events;          // The events to poll for
-            internal PollEvents TriggeredEvents; // The events that occurred which triggered the poll
-        }
-
         [DllImport(Libraries.IOPortsNative, EntryPoint = "SystemIoPortsNative_SerialPortOpen", SetLastError = true)]
         internal static extern SafeSerialDeviceHandle SerialPortOpen(string name);
 
diff --git a/src/libraries/System.IO.Ports/src/System.IO.Ports.csproj b/src/libraries/System.IO.Ports/src/System.IO.Ports.csproj
index 915a0a8..abd8646 100644
--- a/src/libraries/System.IO.Ports/src/System.IO.Ports.csproj
+++ b/src/libraries/System.IO.Ports/src/System.IO.Ports.csproj
@@ -129,6 +129,8 @@
              Link="Common\Interop\Unix\Interop.Errors.cs" />
     <Compile Include="$(CommonPath)Interop\Unix\Interop.IOErrors.cs"
              Link="Common\Interop\Unix\Interop.IOErrors.cs" />
+    <Compile Include="$(CommonPath)Interop\Unix\Interop.Poll.Structs.cs"
+             Link="Common\Interop\Unix\Interop.Poll.Structs.cs" />
     <Compile Include="$(CommonPath)System\Threading\Tasks\TaskToApm.cs"
              Link="Common\System\Threading\Tasks\TaskToApm.cs" />
   </ItemGroup>
diff --git a/src/libraries/System.IO.Ports/src/System/IO/Ports/SerialStream.Unix.cs b/src/libraries/System.IO.Ports/src/System/IO/Ports/SerialStream.Unix.cs
index 887c869..dd8ea97 100644
--- a/src/libraries/System.IO.Ports/src/System/IO/Ports/SerialStream.Unix.cs
+++ b/src/libraries/System.IO.Ports/src/System/IO/Ports/SerialStream.Unix.cs
@@ -464,7 +464,7 @@ namespace System.IO.Ports
         // Will wait `timeout` miliseconds or until reading or writing is possible
         // If no operation is requested it will throw
         // Returns event which has happened
-        private Interop.Serial.PollEvents PollEvents(int timeout, bool pollReadEvents, bool pollWriteEvents, out Interop.ErrorInfo? error)
+        private Interop.PollEvents PollEvents(int timeout, bool pollReadEvents, bool pollWriteEvents, out Interop.ErrorInfo? error)
         {
             if (!pollReadEvents && !pollWriteEvents)
             {
@@ -472,19 +472,19 @@ namespace System.IO.Ports
                 throw new Exception();
             }
 
-            Interop.Serial.PollEvents eventsToPoll = Interop.Serial.PollEvents.POLLERR;
+            Interop.PollEvents eventsToPoll = Interop.PollEvents.POLLERR;
 
             if (pollReadEvents)
             {
-                eventsToPoll |= Interop.Serial.PollEvents.POLLIN;
+                eventsToPoll |= Interop.PollEvents.POLLIN;
             }
 
             if (pollWriteEvents)
             {
-                eventsToPoll |= Interop.Serial.PollEvents.POLLOUT;
+                eventsToPoll |= Interop.PollEvents.POLLOUT;
             }
 
-            Interop.Serial.PollEvents events = Interop.Serial.PollEvents.POLLNONE;
+            Interop.PollEvents events = Interop.PollEvents.POLLNONE;
             Interop.Error ret = Interop.Serial.Poll(
                 _handle,
                 eventsToPoll,
@@ -843,7 +843,7 @@ namespace System.IO.Ports
                 }
                 else
                 {
-                    Interop.Serial.PollEvents events = PollEvents(1,
+                    Interop.PollEvents events = PollEvents(1,
                                                                pollReadEvents: hasPendingReads,
                                                                pollWriteEvents: hasPendingWrites,
                                                                out Interop.ErrorInfo? error);
@@ -854,21 +854,21 @@ namespace System.IO.Ports
                         break;
                     }
 
-                    if (events.HasFlag(Interop.Serial.PollEvents.POLLNVAL) ||
-                        events.HasFlag(Interop.Serial.PollEvents.POLLERR))
+                    if (events.HasFlag(Interop.PollEvents.POLLNVAL) ||
+                        events.HasFlag(Interop.PollEvents.POLLERR))
                     {
                         // bad descriptor or some other error we can't handle
                         FinishPendingIORequests();
                         break;
                     }
 
-                    if (events.HasFlag(Interop.Serial.PollEvents.POLLIN))
+                    if (events.HasFlag(Interop.PollEvents.POLLIN))
                     {
                         int bytesRead = DoIORequest(_readQueue, _processReadDelegate);
                         _totalBytesRead += bytesRead;
                     }
 
-                    if (events.HasFlag(Interop.Serial.PollEvents.POLLOUT))
+                    if (events.HasFlag(Interop.PollEvents.POLLOUT))
                     {
                         DoIORequest(_writeQueue, _processWriteDelegate);
                     }
diff --git a/src/libraries/System.Net.Http/src/System.Net.Http.csproj b/src/libraries/System.Net.Http/src/System.Net.Http.csproj
index 18b5292..ee9e25b 100644
--- a/src/libraries/System.Net.Http/src/System.Net.Http.csproj
+++ b/src/libraries/System.Net.Http/src/System.Net.Http.csproj
@@ -541,6 +541,8 @@
              Link="Common\Interop\Unix\System.Native\Interop.Pipe.cs" />
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.Poll.cs"
              Link="Common\Interop\Unix\libc\Interop.Poll.cs" />
+    <Compile Include="$(CommonPath)Interop\Unix\Interop.Poll.Structs.cs"
+             Link="Common\Interop\Unix\Interop.Poll.Structs.cs" />
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.Read.cs"
              Link="Common\Interop\Unix\libc\Interop.Read.cs" />
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.Write.cs"
diff --git a/src/libraries/System.Net.Sockets/src/System.Net.Sockets.csproj b/src/libraries/System.Net.Sockets/src/System.Net.Sockets.csproj
index f8a2cce..fea68b7 100644
--- a/src/libraries/System.Net.Sockets/src/System.Net.Sockets.csproj
+++ b/src/libraries/System.Net.Sockets/src/System.Net.Sockets.csproj
@@ -272,6 +272,8 @@
              Link="Common\Interop\Unix\System.Native\Interop.MulticastOption.cs" />
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.Poll.cs"
              Link="Common\Interop\Unix\System.Native\Interop.Poll.cs" />
+    <Compile Include="$(CommonPath)Interop\Unix\Interop.Poll.Structs.cs"
+             Link="Common\Interop\Unix\Interop.Poll.Structs.cs" />
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.PlatformSocketSupport.cs"
              Link="Common\Interop\Unix\System.Native\Interop.PlatformSocketSupport.cs" />
     <Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.ReceiveMessage.cs"
diff --git a/src/libraries/System.Net.Sockets/src/System/Net/Sockets/SocketPal.Unix.cs b/src/libraries/System.Net.Sockets/src/System/Net/Sockets/SocketPal.Unix.cs
index 68f8c82..2c3fd57 100644
--- a/src/libraries/System.Net.Sockets/src/System/Net/Sockets/SocketPal.Unix.cs
+++ b/src/libraries/System.Net.Sockets/src/System/Net/Sockets/SocketPal.Unix.cs
@@ -1453,17 +1453,17 @@ namespace System.Net.Sockets
 
         public static unsafe SocketError Poll(SafeSocketHandle handle, int microseconds, SelectMode mode, out bool status)
         {
-            Interop.Sys.PollEvents inEvent = Interop.Sys.PollEvents.POLLNONE;
+            Interop.PollEvents inEvent = Interop.PollEvents.POLLNONE;
             switch (mode)
             {
-                case SelectMode.SelectRead: inEvent = Interop.Sys.PollEvents.POLLIN; break;
-                case SelectMode.SelectWrite: inEvent = Interop.Sys.PollEvents.POLLOUT; break;
-                case SelectMode.SelectError: inEvent = Interop.Sys.PollEvents.POLLPRI; break;
+                case SelectMode.SelectRead: inEvent = Interop.PollEvents.POLLIN; break;
+                case SelectMode.SelectWrite: inEvent = Interop.PollEvents.POLLOUT; break;
+                case SelectMode.SelectError: inEvent = Interop.PollEvents.POLLPRI; break;
             }
 
             int milliseconds = microseconds == -1 ? -1 : microseconds / 1000;
 
-            Interop.Sys.PollEvents outEvents;
+            Interop.PollEvents outEvents;
             Interop.Error err = Interop.Sys.Poll(handle, inEvent, milliseconds, out outEvents);
             if (err != Interop.Error.SUCCESS)
             {
@@ -1473,9 +1473,9 @@ namespace System.Net.Sockets
 
             switch (mode)
             {
-                case SelectMode.SelectRead: status = (outEvents & (Interop.Sys.PollEvents.POLLIN | Interop.Sys.PollEvents.POLLHUP)) != 0; break;
-                case SelectMode.SelectWrite: status = (outEvents & Interop.Sys.PollEvents.POLLOUT) != 0; break;
-                case SelectMode.SelectError: status = (outEvents & (Interop.Sys.PollEvents.POLLERR | Interop.Sys.PollEvents.POLLPRI)) != 0; break;
+                case SelectMode.SelectRead: status = (outEvents & (Interop.PollEvents.POLLIN | Interop.PollEvents.POLLHUP)) != 0; break;
+                case SelectMode.SelectWrite: status = (outEvents & Interop.PollEvents.POLLOUT) != 0; break;
+                case SelectMode.SelectError: status = (outEvents & (Interop.PollEvents.POLLERR | Interop.PollEvents.POLLPRI)) != 0; break;
                 default: status = false; break;
             }
             return SocketError.Success;
@@ -1498,7 +1498,7 @@ namespace System.Net.Sockets
             const int StackThreshold = 80; // arbitrary limit to avoid too much space on stack
             if (count < StackThreshold)
             {
-                Interop.Sys.PollEvent* eventsOnStack = stackalloc Interop.Sys.PollEvent[count];
+                Interop.PollEvent* eventsOnStack = stackalloc Interop.PollEvent[count];
                 return SelectViaPoll(
                     checkRead, checkReadInitialCount,
                     checkWrite, checkWriteInitialCount,
@@ -1507,8 +1507,8 @@ namespace System.Net.Sockets
             }
             else
             {
-                var eventsOnHeap = new Interop.Sys.PollEvent[count];
-                fixed (Interop.Sys.PollEvent* eventsOnHeapPtr = &eventsOnHeap[0])
+                var eventsOnHeap = new Interop.PollEvent[count];
+                fixed (Interop.PollEvent* eventsOnHeapPtr = &eventsOnHeap[0])
                 {
                     return SelectViaPoll(
                         checkRead, checkReadInitialCount,
@@ -1523,7 +1523,7 @@ namespace System.Net.Sockets
             IList? checkRead, int checkReadInitialCount,
             IList? checkWrite, int checkWriteInitialCount,
             IList? checkError, int checkErrorInitialCount,
-            Interop.Sys.PollEvent* events, int eventsLength,
+            Interop.PollEvent* events, int eventsLength,
             int microseconds)
         {
             // Add each of the list's contents to the events array
@@ -1534,9 +1534,9 @@ namespace System.Net.Sockets
             {
                 // In case we can't increase the reference count for each Socket,
                 // we'll unref refAdded Sockets in the finally block ordered: [checkRead, checkWrite, checkError].
-                AddToPollArray(events, eventsLength, checkRead, ref offset, Interop.Sys.PollEvents.POLLIN | Interop.Sys.PollEvents.POLLHUP, ref refsAdded);
-                AddToPollArray(events, eventsLength, checkWrite, ref offset, Interop.Sys.PollEvents.POLLOUT, ref refsAdded);
-                AddToPollArray(events, eventsLength, checkError, ref offset, Interop.Sys.PollEvents.POLLPRI, ref refsAdded);
+                AddToPollArray(events, eventsLength, checkRead, ref offset, Interop.PollEvents.POLLIN | Interop.PollEvents.POLLHUP, ref refsAdded);
+                AddToPollArray(events, eventsLength, checkWrite, ref offset, Interop.PollEvents.POLLOUT, ref refsAdded);
+                AddToPollArray(events, eventsLength, checkError, ref offset, Interop.PollEvents.POLLPRI, ref refsAdded);
                 Debug.Assert(offset == eventsLength, $"Invalid adds. offset={offset}, eventsLength={eventsLength}.");
                 Debug.Assert(refsAdded == eventsLength, $"Invalid ref adds. refsAdded={refsAdded}, eventsLength={eventsLength}.");
 
@@ -1562,9 +1562,9 @@ namespace System.Net.Sockets
                 }
                 else
                 {
-                    FilterPollList(checkRead, events, checkReadInitialCount - 1, Interop.Sys.PollEvents.POLLIN | Interop.Sys.PollEvents.POLLHUP, ref refsAdded);
-                    FilterPollList(checkWrite, events, checkWriteInitialCount + checkReadInitialCount - 1, Interop.Sys.PollEvents.POLLOUT, ref refsAdded);
-                    FilterPollList(checkError, events, checkErrorInitialCount + checkWriteInitialCount + checkReadInitialCount - 1, Interop.Sys.PollEvents.POLLERR | Interop.Sys.PollEvents.POLLPRI, ref refsAdded);
+                    FilterPollList(checkRead, events, checkReadInitialCount - 1, Interop.PollEvents.POLLIN | Interop.PollEvents.POLLHUP, ref refsAdded);
+                    FilterPollList(checkWrite, events, checkWriteInitialCount + checkReadInitialCount - 1, Interop.PollEvents.POLLOUT, ref refsAdded);
+                    FilterPollList(checkError, events, checkErrorInitialCount + checkWriteInitialCount + checkReadInitialCount - 1, Interop.PollEvents.POLLERR | Interop.PollEvents.POLLPRI, ref refsAdded);
                 }
 
                 return SocketError.Success;
@@ -1580,7 +1580,7 @@ namespace System.Net.Sockets
             }
         }
 
-        private static unsafe void AddToPollArray(Interop.Sys.PollEvent* arr, int arrLength, IList? socketList, ref int arrOffset, Interop.Sys.PollEvents events, ref int refsAdded)
+        private static unsafe void AddToPollArray(Interop.PollEvent* arr, int arrLength, IList? socketList, ref int arrOffset, Interop.PollEvents events, ref int refsAdded)
         {
             if (socketList == null)
                 return;
@@ -1603,12 +1603,12 @@ namespace System.Net.Sockets
                 bool success = false;
                 socket.InternalSafeHandle.DangerousAddRef(ref success);
                 int fd = (int)socket.InternalSafeHandle.DangerousGetHandle();
-                arr[arrOffset++] = new Interop.Sys.PollEvent { Events = events, FileDescriptor = fd };
+                arr[arrOffset++] = new Interop.PollEvent { Events = events, FileDescriptor = fd };
                 refsAdded++;
             }
         }
 
-        private static unsafe void FilterPollList(IList? socketList, Interop.Sys.PollEvent* arr, int arrEndOffset, Interop.Sys.PollEvents desiredEvents, ref int refsAdded)
+        private static unsafe void FilterPollList(IList? socketList, Interop.PollEvent* arr, int arrEndOffset, Interop.PollEvents desiredEvents, ref int refsAdded)
         {
             if (socketList == null)
                 return;
-- 
2.7.4