Shim pipe and fcntl

src/Common/src/Interop/Unix/System.Native/Interop.Fcntl.cs

@@ -0,0 +1,25 @@
+// Copyright (c) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Runtime.InteropServices;
+
+internal static partial class Interop
+{
+    internal static partial class Sys
+    {
+        internal static class Fcntl
+        {
+            internal static readonly bool CanGetSetPipeSz = (FcntlCanGetSetPipeSz() != 0);
+
+            [DllImport(Libraries.SystemNative, EntryPoint="FcntlGetPipeSz", SetLastError=true)]
+            internal static extern int GetPipeSz(int fd);
+
+            [DllImport(Libraries.SystemNative, EntryPoint="FcntlSetPipeSz", SetLastError=true)]
+            internal static extern int SetPipeSz(int fd, int size);
+
+            [DllImport(Libraries.SystemNative)]
+            private static extern int FcntlCanGetSetPipeSz();
+        }
+    }
+}

src/Common/src/Interop/Unix/System.Native/Interop.Pipe.cs

@@ -0,0 +1,30 @@
+// Copyright (c) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Runtime.InteropServices;
+
+internal static partial class Interop
+{
+    internal static partial class Sys
+    {
+        [Flags]
+        internal enum PipeFlags
+        {
+            O_CLOEXEC = 0x0010,
+        }
+
+        /// <summary>
+        /// The index into the array filled by <see cref="pipe"/> which represents the read end of the pipe.
+        /// </summary>
+        internal const int ReadEndOfPipe = 0;
+
+        /// <summary>
+        /// The index into the array filled by <see cref="pipe"/> which represents the read end of the pipe.
+        /// </summary>
+        internal const int WriteEndOfPipe = 1;
+
+        [DllImport(Libraries.SystemNative, SetLastError = true)]
+        internal static extern unsafe int Pipe(int* pipefd, PipeFlags flags = 0); // pipefd is an array of two ints
+    }
+}

src/Common/src/Interop/Unix/libcurl/Interop.SafeCurlHandle.cs

@@ -77,7 +77,7 @@ public SafeCurlMultiHandle()
                 {
                     fixed(int* fds = _specialFds)
                     {
-                        while (Interop.CheckIo(libc.pipe(fds)));
+                        while (Interop.CheckIo(Interop.Sys.Pipe(fds)));
                     }
                 }
             }
@@ -116,7 +116,7 @@ internal void PollFds(List<libc.pollfd> readyFds)
                     // is ready for a read/write. The special fd is the read end of a pipe
                     // Whenever an fd is added/removed in _fdSet, a write happens to the
                     // write end of the pipe thus causing the poll to return.
-                    pollFds[0].fd = _specialFds[libc.ReadEndOfPipe];
+                    pollFds[0].fd = _specialFds[Interop.Sys.ReadEndOfPipe];
                     pollFds[0].events = PollFlags.POLLIN;
                     int i = 1;
                     foreach (int fd in _fdSet)
@@ -186,7 +186,7 @@ internal void SignalFdSetChange(int fd, bool isRemove)
                 {
                     // Write to special fd
                     byte* dummyBytes = stackalloc byte[1];
-                    if ((int)libc.write(_specialFds[libc.WriteEndOfPipe], dummyBytes, (size_t)1) <= 0)
+                    if ((int)libc.write(_specialFds[Interop.Sys.WriteEndOfPipe], dummyBytes, (size_t)1) <= 0)
                     {
                         // TODO: How to handle errors?
                         throw new InvalidOperationException("Cannot write data: " + Marshal.GetLastWin32Error());
@@ -212,8 +212,8 @@ protected override bool ReleaseHandle()
                 Debug.Assert(0 == _requestCount);
                 Debug.Assert(_pollCancelled);
 
-                Interop.Sys.Close(_specialFds[libc.ReadEndOfPipe]);
-                Interop.Sys.Close(_specialFds[libc.WriteEndOfPipe]);
+                Interop.Sys.Close(_specialFds[Interop.Sys.ReadEndOfPipe]);
+                Interop.Sys.Close(_specialFds[Interop.Sys.WriteEndOfPipe]);
                 libcurl.curl_multi_cleanup(this.handle);
 
                 return true;
@@ -227,7 +227,7 @@ private int ReadSpecialFd(PollFlags revents)
                     return -1;
                 }
                 Debug.Assert((revents & PollFlags.POLLIN) != 0);
-                int pipeReadFd = _specialFds[libc.ReadEndOfPipe];
+                int pipeReadFd = _specialFds[Interop.Sys.ReadEndOfPipe];
                 int bytesRead = 0;
                 unsafe
                 {

src/Native/System.Native/pal_io.cpp

@@ -302,3 +302,58 @@ int32_t CloseDir(DIR* dir)
 {
     return closedir(dir);
 }
+
+extern "C"
+int32_t Pipe(int32_t pipeFds[2], int32_t flags)
+{
+    switch (flags)
+    {
+    case 0:
+        break;
+    case PAL_O_CLOEXEC:
+        flags = O_CLOEXEC;
+        break;
+    default:
+        assert(!"Unknown flag.");
+        errno = EINVAL;
+        return -1;
+    }
+
+#if HAVE_PIPE2
+    return pipe2(pipeFds, flags);
+#else
+    return pipe(pipeFds); // CLOEXEC intentionally ignored on platforms without pipe2.
+#endif
+}
+
+extern "C"
+int32_t FnctlCanGetSetPipeSz()
+{
+#if defined(F_GETPIPE_SZ) && defined(F_SETPIPE_SZ)
+    return true;
+#else
+    return false;
+#endif
+}
+
+extern "C"
+int32_t FcntlGetPipeSz(int32_t fd)
+{
+#ifdef F_GETPIPE_SZ
+    return fcntl(fd, F_GETPIPE_SZ);
+#else
+    errno = ENOTSUP;
+    return -1;
+#endif
+}
+
+extern "C"
+int32_t FcntlSetPipeSz(int32_t fd, int32_t size)
+{
+#ifdef F_SETPIPE_SZ
+    return fcntl(fd, F_SETPIPE_SZ, size);
+#else
+    errno = ENOTSUP;
+    return -1
+#endif
+}

src/Native/System.Native/pal_io.h

@@ -232,3 +232,52 @@ DIR* OpenDir(
 extern "C"
 int32_t CloseDir(
     DIR* dir);
+
+int32_t CloseDir(DIR* directory);
+
+/**
+ * Creates a pipe. Implemented as shim to pipe(2) or pipe2(2) if available.
+ * Flags are ignored if pipe2 is not available.
+ *
+ * Returns 0 for success, -1 for failure. Sets errno on failure.
+ */
+extern "C"
+int32_t Pipe(
+    int32_t pipefd[2], // [out] pipefds[0] gets read end, pipefd[1] gets write end.
+    int32_t flags);    // 0 for defaults or PAL_O_CLOEXEC for close-on-exec
+
+
+// NOTE: Rather than a general fcntl shim, we opt to export separate functions 
+// for each command. This allows use to have strongly typed arguments and saves
+// complexity around converting command codes.
+
+/**
+ * Determines if the current platform supports getting and setting pipe capacity.
+ *
+ * Returns true (non-zero) if supported, false (zero) if not.
+ */
+extern "C"
+int32_t FnctlCanGetSetPipeSz();
+
+/**
+ * Gets the capacity of a pipe.
+ *
+ * Returns the capacity or -1 with errno set aprropriately on failure.
+ *
+ * NOTE: Some platforms do not support this operation and will always fail with errno = ENOTSUP.
+ */
+extern "C"
+int32_t FcntlGetPipeSz(
+    int32_t fd);
+
+/**
+ * Sets the capacity of a pipe.
+ *
+ * Returns 0 for success, -1 for failure. Sets errno for failure.
+ *
+ * NOTE: Some platforms do not support this operation and will always fail with errno = ENOTSUP.
+ */
+extern "C"
+int32_t FcntlSetPipeSz(
+    int32_t fd,
+    int32_t size);

src/Native/config.h.in

@@ -1,6 +1,7 @@
 #pragma once
 
 #cmakedefine01 HAVE_STAT64
+#cmakedefine01 HAVE_PIPE2
 #cmakedefine01 HAVE_STAT_BIRTHTIME
 #cmakedefine01 HAVE_GNU_STRERROR_R
 #cmakedefine01 HAVE_DIRENT_NAME_LEN

src/Native/configure.cmake

@@ -6,6 +6,10 @@ check_function_exists(
     stat64
     HAVE_STAT64)
 
+check_function_exists(
+    pipe2
+    HAVE_PIPE2)
+
 check_struct_has_member(
     "struct stat"
     st_birthtime

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

@@ -153,12 +153,12 @@
     <Compile Include="$(CommonPath)\Interop\Unix\Interop.IOErrors.cs">
       <Link>Common\Interop\Unix\Interop.IOErrors.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Linux\libc\Interop.pipe2.cs">
-      <Link>Common\Interop\Unix\Interop.pipe2.cs</Link>
-    </Compile>
     <Compile Include="$(CommonPath)\Interop\Unix\System.Native\Interop.Close.cs">
       <Link>Common\Interop\Unix\Interop.Close.cs</Link>
     </Compile>
+    <Compile Include="$(CommonPath)\Interop\Unix\System.Native\Interop.Fcntl.cs">
+      <Link>Common\Interop\Unix\Interop.Fcntl.cs</Link>
+    </Compile>
     <Compile Include="$(CommonPath)\Interop\Unix\libc\Interop.gethostname.cs">
       <Link>Common\Interop\Unix\Interop.gethostname.cs</Link>
     </Compile>
@@ -180,8 +180,8 @@
     <Compile Include="$(CommonPath)\Interop\Unix\libc\Interop.Permissions.cs">
       <Link>Common\Interop\Unix\Interop.Permissions.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Unix\libc\Interop.pipe.cs">
-      <Link>Common\Interop\Unix\Interop.pipe.cs</Link>
+    <Compile Include="$(CommonPath)\Interop\Unix\System.Native\Interop.Pipe.cs">
+      <Link>Common\Interop\Unix\Interop.Pipe.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)\Interop\Unix\libc\Interop.poll.cs">
       <Link>Common\Interop\Unix\Interop.poll.cs</Link>
@@ -205,20 +205,6 @@
       <Link>Common\System\Threading\Tasks\ForceAsyncAwaiter.cs</Link>
     </Compile>
   </ItemGroup>
-  <!-- Linux -->
-  <ItemGroup Condition="'$(TargetsLinux)' == 'true'">
-    <Compile Include="System\IO\Pipes\PipeStream.Linux.cs" />
-    <Compile Include="$(CommonPath)\Interop\Unix\libc\Interop.fcntl.cs">
-      <Link>Common\Interop\Unix\Interop.fcntl.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonPath)\Interop\Linux\libc\Interop.FcntlCommands.cs">
-      <Link>Common\Interop\Linux\Interop.FcntlCommands.cs</Link>
-    </Compile>
-  </ItemGroup>
-  <!-- OSX -->
-  <ItemGroup Condition="'$(TargetsOSX)' == 'true'">
-    <Compile Include="System\IO\Pipes\PipeStream.OSX.cs" />
-  </ItemGroup>
   <!-- Resource files -->
   <ItemGroup>
     <None Include="project.json" />