Ensure EINTR handling is much more consistent across the board

src/coreclr/debug/createdump/crashinfounix.cpp

@@ -84,7 +84,7 @@ CrashInfo::CleanupAndResumeProcess()
         if (ptrace(PTRACE_DETACH, thread->Tid(), nullptr, nullptr) != -1)
         {
             int waitStatus;
-            waitpid(thread->Tid(), &waitStatus, __WALL);
+            while (-1 == waitpid(thread->Tid(), &waitStatus, __WALL) && errno == EINTR);
         }
     }
     if (m_fdMem != -1)
@@ -113,24 +113,34 @@ CrashInfo::EnumerateAndSuspendThreads()
         return false;
     }
 
-    DIR* taskDir = opendir(taskPath);
+    DIR* taskDir;
+    while ((taskDir = opendir(taskPath)) == nullptr && errno == EINTR);
+
     if (taskDir == nullptr)
     {
         printf_error("Problem enumerating threads: opendir(%s) FAILED %s (%d)\n", taskPath, strerror(errno), errno);
         return false;
     }
 
     struct dirent* entry;
-    while ((entry = readdir(taskDir)) != nullptr)
+    while (true)
     {
+        do
+        {
+            errno = 0;
+            entry = readdir(taskDir);
+        }
+        while (entry == nullptr && errno == EINTR);
+        if (entry == nullptr) break;
+
         pid_t tid = static_cast<pid_t>(strtol(entry->d_name, nullptr, 10));
         if (tid != 0)
         {
             // Reference: http://stackoverflow.com/questions/18577956/how-to-use-ptrace-to-get-a-consistent-view-of-multiple-threads
             if (ptrace(PTRACE_ATTACH, tid, nullptr, nullptr) != -1)
             {
                 int waitStatus;
-                waitpid(tid, &waitStatus, __WALL);
+                while (-1 == waitpid(tid, &waitStatus, __WALL) && errno == EINTR);
             }
             else
             {

src/coreclr/debug/createdump/crashreportwriter.cpp

@@ -48,7 +48,7 @@ CrashReportWriter::WriteCrashReport(const std::string& dumpFileName)
         printf_error("Writing the crash report file FAILED\n");
 
         // Delete the partial json file on error
-        remove(crashReportFile.c_str());
+        while (-1 == remove(crashReportFile.c_str()) && errno == EINTR);
     }
 }
 

src/coreclr/debug/createdump/createdumpunix.cpp

@@ -91,7 +91,7 @@ CreateDump(const CreateDumpOptions& options)
             printf_error("Writing dump FAILED\n");
 
             // Delete the partial dump file on error
-            remove(dumpPath.c_str());
+            while (-1 == remove(dumpPath.c_str()) && errno == EINTR);
             goto exit;
         }
     }

src/coreclr/debug/debug-pal/unix/twowaypipe.cpp

@@ -1,6 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+#include <errno.h>
 #include <pal.h>
 #include <unistd.h>
 #include <fcntl.h>
@@ -22,19 +23,22 @@ bool TwoWayPipe::CreateServer(const ProcessDescriptor& pd)
     PAL_GetTransportPipeName(m_inPipeName, pd.m_Pid, pd.m_ApplicationGroupId, "in");
     PAL_GetTransportPipeName(m_outPipeName, pd.m_Pid, pd.m_ApplicationGroupId, "out");
 
-    unlink(m_inPipeName);
+    while (-1 == unlink(m_inPipeName) && errno == EINTR);
 
-    if (mkfifo(m_inPipeName, S_IRWXU) == -1)
+    int mkfifo_result;
+    while (-1 == (mkfifo_result = mkfifo(m_inPipeName, S_IRWXU)) && errno == EINTR);
+    if (mkfifo_result == -1)
     {
         return false;
     }
 
 
-    unlink(m_outPipeName);
+    while (-1 == unlink(m_outPipeName) && errno == EINTR);
 
-    if (mkfifo(m_outPipeName, S_IRWXU) == -1)
+    while (-1 == (mkfifo_result = mkfifo(m_outPipeName, S_IRWXU)) && errno == EINTR);
+    if (mkfifo_result == -1)
     {
-        unlink(m_inPipeName);
+        while (-1 == unlink(m_inPipeName) && errno == EINTR);
         return false;
     }
 
@@ -166,8 +170,8 @@ bool TwoWayPipe::Disconnect()
 
     if (m_state == ServerConnected || m_state == Created)
     {
-        unlink(m_inPipeName);
-        unlink(m_outPipeName);
+        while (-1 == unlink(m_inPipeName) && errno == EINTR);
+        while (-1 == unlink(m_outPipeName) && errno == EINTR);
     }
 
     m_state = NotInitialized;
@@ -178,6 +182,6 @@ bool TwoWayPipe::Disconnect()
 // and semaphores when the debugger detects the debuggee process  exited.
 void TwoWayPipe::CleanupTargetProcess()
 {
-    unlink(m_inPipeName);
-    unlink(m_outPipeName);
+    while (-1 == unlink(m_inPipeName) && errno == EINTR);
+    while (-1 == unlink(m_outPipeName) && errno == EINTR);
 }

src/coreclr/gc/unix/cgroup.cpp

@@ -124,7 +124,8 @@ class CGroup
 #else
 
         struct statfs stats;
-        int result = statfs("/sys/fs/cgroup", &stats);
+        int result;
+        while (-1 == (result = statfs("/sys/fs/cgroup", &stats)) && errno == EINTR);
         if (result != 0)
             return 0;
 

src/coreclr/gc/unix/numasupport.cpp

@@ -28,11 +28,19 @@ static int GetNodeNum(const char* path, bool firstOnly)
     struct dirent *entry;
     int result = -1;
 
-    dir = opendir(path);
+    while ((dir = opendir(path)) == nullptr && errno == EINTR);
     if (dir)
     {
-        while ((entry = readdir(dir)) != NULL)
+        while (true)
         {
+            do
+            {
+                errno = 0;
+                entry = readdir(dir);
+            }
+            while (entry == nullptr && errno == EINTR);
+            if (entry == nullptr) break;
+
             if (strncmp(entry->d_name, "node", STRING_LENGTH("node")))
                 continue;
 

src/coreclr/hosts/corerun/corerun.hpp

@@ -441,7 +441,9 @@ namespace pal
     {
         // Check if the specified path exists
         struct stat sb;
-        if (stat(file_path, &sb) == -1)
+        int result;
+        while (-1 == (result = stat(file_path, &sb)) && errno == EINTR);
+        if (result == -1)
         {
             perror(W("Path not found"));
             return false;
@@ -470,7 +472,9 @@ namespace pal
             return false;
 
         struct stat buf;
-        if (fstat(fd, &buf) == -1)
+        int fstat_result;
+        while (-1 == (fstat_result = fstat(fd, &buf)) && errno == EINTR);
+        if (fstat_result == -1)
         {
             close(fd);
             return false;
@@ -504,16 +508,26 @@ namespace pal
         assert(ext != nullptr);
         const size_t ext_len = pal::strlen(ext);
 
-        DIR* dir = opendir(directory.c_str());
+        DIR* dir;
+        while ((dir = opendir(directory.c_str())) == nullptr && errno == EINTR);
+
         if (dir == nullptr)
             return {};
 
         stringstream_t file_list;
 
         // For all entries in the directory
         struct dirent* entry;
-        while ((entry = readdir(dir)) != nullptr)
+        while (true)
         {
+            do
+            {
+                errno = 0;
+                entry = readdir(dir);
+            }
+            while (entry == nullptr && errno == EINTR);
+            if (entry == nullptr) break;
+
 #if HAVE_DIRENT_D_TYPE
             int dirEntryType = entry->d_type;
 #else

src/coreclr/ilasm/main.cpp

@@ -11,6 +11,7 @@
 #include "clrversion.h"
 
 #include "strsafe.h"
+#include <errno.h>
 #define ASSERTE_ALL_BUILDS(expr) _ASSERTE_ALL_BUILDS((expr))
 
 WCHAR* EqualOrColon(_In_ __nullterminated WCHAR* szArg)
@@ -844,7 +845,7 @@ extern "C" int _cdecl wmain(int argc, _In_ WCHAR **argv)
         MAKE_UTF8PTR_FROMWIDE_NOTHROW(szOutputFilename, wzOutputFilename);
         if (szOutputFilename != NULL)
         {
-            remove(szOutputFilename);
+            while (-1 == remove(szOutputFilename) && errno == EINTR);
         }
 #endif
     }

src/coreclr/minipal/Unix/doublemapping.cpp

@@ -70,9 +70,9 @@ bool VMToOSInterface::CreateDoubleMemoryMapper(void** pHandle, size_t *pMaxExecu
         char name[24];
         sprintf(name, "/shm-dotnet-%d", getpid());
         name[sizeof(name) - 1] = '\0';
-        shm_unlink(name);
+        while (-1 == shm_unlink(name) && errno == EINTR);
         fd = shm_open(name, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW, 0600);
-        shm_unlink(name);
+        while (-1 == shm_unlink(name) && errno == EINTR);
     }
 #endif // !TARGET_ANDROID
 
@@ -82,7 +82,9 @@ bool VMToOSInterface::CreateDoubleMemoryMapper(void** pHandle, size_t *pMaxExecu
     }
 #endif
 
-    if (ftruncate(fd, MaxDoubleMappedSize) == -1)
+    int ftruncate_result;
+    while (-1 == (ftruncate_result = ftruncate(fd, MaxDoubleMappedSize)) && errno == EINTR);
+    if (ftruncate_result == -1)
     {
         close(fd);
         return false;
@@ -381,16 +383,18 @@ TemplateThunkMappingData *InitializeTemplateThunkMappingData(void* pTemplate)
             char name[24];
             sprintf(name, "/shm-dotnet-template-%d", getpid());
             name[sizeof(name) - 1] = '\0';
-            shm_unlink(name);
+            while (-1 == shm_unlink(name) && errno == EINTR);
             fd = shm_open(name, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW, 0600);
-            shm_unlink(name);
+            while (-1 == shm_unlink(name) && errno == EINTR);
         }
 #endif // !TARGET_ANDROID
 #endif
         if (fd != -1)
         {
             off_t maxFileSize = MAX_TEMPLATE_THUNK_TYPES * 0x10000; // The largest page size we support currently is 64KB.
-            if (ftruncate(fd, maxFileSize) == -1) // Reserve a decent size chunk of logical memory for these things.
+            int ftruncate_result;
+            while (-1 == (ftruncate_result = ftruncate(fd, maxFileSize)) && errno == EINTR);
+            if (ftruncate_result == -1) // Reserve a decent size chunk of logical memory for these things.
             {
                 close(fd);
             }

src/coreclr/nativeaot/Runtime/unix/PalCreateDump.cpp

@@ -214,7 +214,9 @@ CreateCrashDump(
     int cbErrorMessageBuffer)
 {
     int pipe_descs[2];
-    if (pipe(pipe_descs) == -1)
+    int pipe_result;
+    while (-1 == (pipe_result = pipe(pipe_descs)) && errno == EINTR);
+    if (pipe_result == -1)
     {
         if (errorMessageBuffer != nullptr)
         {
@@ -248,7 +250,7 @@ CreateCrashDump(
         // Only dup the child's stderr if there is error buffer
         if (errorMessageBuffer != nullptr)
         {
-            dup2(child_pipe, STDERR_FILENO);
+            while (-1 == dup2(child_pipe, STDERR_FILENO) && errno == EINTR);
         }
         // Execute the createdump program
         if (execv(argv[0], (char* const *)argv) == -1)
@@ -292,7 +294,8 @@ CreateCrashDump(
 
         // Parent waits until the child process is done
         int wstatus = 0;
-        int result = waitpid(childpid, &wstatus, 0);
+        int result;
+        while (-1 == (result = waitpid(childpid, &wstatus, 0)) && errno == EINTR);
         if (result != childpid)
         {
             fprintf(stderr, "Problem waiting for createdump: waitpid() FAILED result %d wstatus %08x errno %s (%d)\n",
@@ -571,7 +574,9 @@ PalCreateDumpInitialize()
         strncat(program, DumpGeneratorName, programLen);
 
         struct stat fileData;
-        if (stat(program, &fileData) == -1 || !S_ISREG(fileData.st_mode))
+        int stat_result;
+        while (-1 == (stat_result = stat(program, &fileData)) && errno == EINTR);
+        if (stat_result == -1 || !S_ISREG(fileData.st_mode))
         {
             fprintf(stderr, "DOTNET_DbgEnableMiniDump is set and the createdump binary does not exist: %s\n", program);
             return true;

src/coreclr/nativeaot/Runtime/unix/cgroupcpu.cpp

@@ -95,7 +95,8 @@ class CGroup
 #else
 
         struct statfs stats;
-        int result = statfs("/sys/fs/cgroup", &stats);
+        int result;
+        while (-1 == (result = statfs("/sys/fs/cgroup", &stats)) && errno == EINTR);
         if (result != 0)
             return 0;
 

src/coreclr/pal/src/file/directory.cpp

@@ -144,7 +144,9 @@ RemoveDirectoryHelper (
         {
             struct stat stat_data;
 
-            if ( stat( lpPathName, &stat_data) == 0 &&
+            int stat_result;
+            while (-1 == (stat_result = stat( lpPathName, &stat_data)) && stat_result == EINTR);
+            if ( stat_result == 0 &&
                  (stat_data.st_mode & S_IFMT) == S_IFREG )
             {
                 /* Not a directory, it is a file. */
@@ -455,7 +457,9 @@ CreateDirectoryA(
     // Canonicalize the path so we can determine its length.
     FILECanonicalizePath(realPathBuf);
 
-    if ( mkdir(realPathBuf, mode) != 0 )
+    int mkdir_result;
+    while (-1 == (mkdir_result = mkdir(realPathBuf, mode)) && errno == EINTR);
+    if ( mkdir_result != 0 )
     {
         TRACE("Creation of directory [%s] was unsuccessful, errno = %d.\n",
               unixPathName, errno);
@@ -522,7 +526,7 @@ SetCurrentDirectoryA(
     }
 
     TRACE("Attempting to open Unix dir [%s]\n", lpPathName);
-    result = chdir(lpPathName);
+    while (-1 == (result = chdir (lpPathName)) && errno == EINTR);
 
     if ( result == 0 )
     {
@@ -534,7 +538,9 @@ SetCurrentDirectoryA(
         {
             struct stat stat_data;
 
-            if ( stat( lpPathName, &stat_data) == 0 &&
+            int stat_result;
+            while (-1 == (stat_result = stat( lpPathName, &stat_data)) && errno == EINTR);
+            if ( stat_result == 0 &&
                  (stat_data.st_mode & S_IFMT) == S_IFREG )
             {
                 /* Not a directory, it is a file. */