Handle EINTR on all IO operations

runtime/bin/process_linux.cc

-// Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "bin/process.h"
 
 #include <errno.h>
 #include <fcntl.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ skipping 69 matching lines @@
 
 static void SetChildOsErrorMessage(char* os_error_message,
                                    int os_error_message_len) {
   SafeStrNCpy(os_error_message, strerror(errno), os_error_message_len);
 }
 
 
 void ExitHandler(int process_signal, siginfo_t* siginfo, void* tmp) {
   int pid = 0;
   int status = 0;
-  while ((pid = waitpid(-1, &status, WNOHANG)) > 0) {
+  while ((pid = TEMP_FAILURE_RETRY(waitpid(-1, &status, WNOHANG))) > 0) {
     int exit_code = 0;
     int negative = 0;
     if (WIFEXITED(status)) {
       exit_code = WEXITSTATUS(status);
     }
     if (WIFSIGNALED(status)) {
       exit_code = WTERMSIG(status);
       negative = 1;
     }
     ProcessInfo* process = LookupProcess(pid);
     if (process != NULL) {
       int message[3] = { pid, exit_code, negative };
       intptr_t result =
           FDUtils::WriteToBlocking(process->fd(), &message, sizeof(message));
       if (result != sizeof(message) && errno != EPIPE) {
         perror("ExitHandler notification failed");
       }
-      close(process->fd());
+      TEMP_FAILURE_RETRY(close(process->fd()));
     }
   }
 }
 
 
 static void ReportChildError(int exec_control_fd) {
   // In the case of failure in the child process write the errno and
   // the OS error message to the exec control pipe and exit.
   int child_errno = errno;
   char* os_error_message = strerror(errno);
   ASSERT(sizeof(child_errno) == sizeof(errno));
   int bytes_written =
       FDUtils::WriteToBlocking(
           exec_control_fd, &child_errno, sizeof(child_errno));
   if (bytes_written == sizeof(child_errno)) {
     FDUtils::WriteToBlocking(
         exec_control_fd, os_error_message, strlen(os_error_message) + 1);
   }
-  close(exec_control_fd);
+  TEMP_FAILURE_RETRY(close(exec_control_fd));
   exit(1);
 }
 
 
 int Process::Start(const char* path,
                    char* arguments[],
                    intptr_t arguments_length,
                    const char* working_directory,
                    intptr_t* in,
                    intptr_t* out,
                    intptr_t* err,
                    intptr_t* id,
                    intptr_t* exit_event,
                    char* os_error_message,
                    int os_error_message_len) {
   pid_t pid;
   int read_in[2];  // Pipe for stdout to child process.
   int read_err[2];  // Pipe for stderr to child process.
   int write_out[2];  // Pipe for stdin to child process.
   int exec_control[2];  // Pipe to get the result from exec.
   int result;
 
-  result = pipe(read_in);
+  result = TEMP_FAILURE_RETRY(pipe(read_in));
   if (result < 0) {
     SetChildOsErrorMessage(os_error_message, os_error_message_len);
     fprintf(stderr, "Error pipe creation failed: %s\n", os_error_message);
     return errno;
   }
 
-  result = pipe(read_err);
+  result = TEMP_FAILURE_RETRY(pipe(read_err));
   if (result < 0) {
     SetChildOsErrorMessage(os_error_message, os_error_message_len);
-    close(read_in[0]);
-    close(read_in[1]);
+    TEMP_FAILURE_RETRY(close(read_in[0]));
+    TEMP_FAILURE_RETRY(close(read_in[1]));
     fprintf(stderr, "Error pipe creation failed: %s\n", os_error_message);
     return errno;
   }
 
-  result = pipe(write_out);
+  result = TEMP_FAILURE_RETRY(pipe(write_out));
   if (result < 0) {
     SetChildOsErrorMessage(os_error_message, os_error_message_len);
-    close(read_in[0]);
-    close(read_in[1]);
-    close(read_err[0]);
-    close(read_err[1]);
+    TEMP_FAILURE_RETRY(close(read_in[0]));
+    TEMP_FAILURE_RETRY(close(read_in[1]));
+    TEMP_FAILURE_RETRY(close(read_err[0]));
+    TEMP_FAILURE_RETRY(close(read_err[1]));
     fprintf(stderr, "Error pipe creation failed: %s\n", os_error_message);
     return errno;
   }
 
-  result = pipe(exec_control);
+  result = TEMP_FAILURE_RETRY(pipe(exec_control));
   if (result < 0) {
     SetChildOsErrorMessage(os_error_message, os_error_message_len);
-    close(read_in[0]);
-    close(read_in[1]);
-    close(read_err[0]);
-    close(read_err[1]);
-    close(write_out[0]);
-    close(write_out[1]);
+    TEMP_FAILURE_RETRY(close(read_in[0]));
+    TEMP_FAILURE_RETRY(close(read_in[1]));
+    TEMP_FAILURE_RETRY(close(read_err[0]));
+    TEMP_FAILURE_RETRY(close(read_err[1]));
+    TEMP_FAILURE_RETRY(close(write_out[0]));
+    TEMP_FAILURE_RETRY(close(write_out[1]));
     fprintf(stderr, "Error pipe creation failed: %s\n", os_error_message);
     return errno;
   }
 
   // Set close on exec on the write file descriptor of the exec control pipe.
-  result = fcntl(
-      exec_control[1], F_SETFD, fcntl(exec_control[1], F_GETFD) | FD_CLOEXEC);
+  result = TEMP_FAILURE_RETRY(
+      fcntl(exec_control[1],
+            F_SETFD,
+            TEMP_FAILURE_RETRY(fcntl(exec_control[1], F_GETFD)) | FD_CLOEXEC));
   if (result < 0) {
     SetChildOsErrorMessage(os_error_message, os_error_message_len);
-    close(read_in[0]);
-    close(read_in[1]);
-    close(read_err[0]);
-    close(read_err[1]);
-    close(write_out[0]);
-    close(write_out[1]);
-    close(exec_control[0]);
-    close(exec_control[1]);
+    TEMP_FAILURE_RETRY(close(read_in[0]));
+    TEMP_FAILURE_RETRY(close(read_in[1]));
+    TEMP_FAILURE_RETRY(close(read_err[0]));
+    TEMP_FAILURE_RETRY(close(read_err[1]));
+    TEMP_FAILURE_RETRY(close(write_out[0]));
+    TEMP_FAILURE_RETRY(close(write_out[1]));
+    TEMP_FAILURE_RETRY(close(exec_control[0]));
+    TEMP_FAILURE_RETRY(close(exec_control[1]));
     fprintf(stderr, "fcntl failed: %s\n", os_error_message);
     return errno;
   }
 
   char** program_arguments = new char*[arguments_length + 2];
   program_arguments[0] = const_cast<char *>(path);
   for (int i = 0; i < arguments_length; i++) {
     program_arguments[i + 1] = arguments[i];
   }
   program_arguments[arguments_length + 1] = NULL;
 
   struct sigaction act;
   bzero(&act, sizeof(act));
   act.sa_sigaction = ExitHandler;
   act.sa_flags = SA_NOCLDSTOP | SA_SIGINFO;
   if (sigaction(SIGCHLD, &act, 0) != 0) {
     perror("Process start: setting signal handler failed");
   }
-  pid = fork();
+  pid = TEMP_FAILURE_RETRY(fork());
   if (pid < 0) {
     SetChildOsErrorMessage(os_error_message, os_error_message_len);
     delete[] program_arguments;
-    close(read_in[0]);
-    close(read_in[1]);
-    close(read_err[0]);
-    close(read_err[1]);
-    close(write_out[0]);
-    close(write_out[1]);
-    close(exec_control[0]);
-    close(exec_control[1]);
+    TEMP_FAILURE_RETRY(close(read_in[0]));
+    TEMP_FAILURE_RETRY(close(read_in[1]));
+    TEMP_FAILURE_RETRY(close(read_err[0]));
+    TEMP_FAILURE_RETRY(close(read_err[1]));
+    TEMP_FAILURE_RETRY(close(write_out[0]));
+    TEMP_FAILURE_RETRY(close(write_out[1]));
+    TEMP_FAILURE_RETRY(close(exec_control[0]));
+    TEMP_FAILURE_RETRY(close(exec_control[1]));
     return errno;
   } else if (pid == 0) {
     // Wait for parent process before setting up the child process.
     char msg;
     int bytes_read = FDUtils::ReadFromBlocking(read_in[0], &msg, sizeof(msg));
     if (bytes_read != sizeof(msg)) {
       perror("Failed receiving notification message");
       exit(1);
     }
 
-    close(write_out[1]);
-    close(read_in[0]);
-    close(read_err[0]);
-    close(exec_control[0]);
+    TEMP_FAILURE_RETRY(close(write_out[1]));
+    TEMP_FAILURE_RETRY(close(read_in[0]));
+    TEMP_FAILURE_RETRY(close(read_err[0]));
+    TEMP_FAILURE_RETRY(close(exec_control[0]));
 
-    if (dup2(write_out[0], STDIN_FILENO) == -1) {
+    if (TEMP_FAILURE_RETRY(dup2(write_out[0], STDIN_FILENO)) == -1) {
       ReportChildError(exec_control[1]);
     }
-    close(write_out[0]);
+    TEMP_FAILURE_RETRY(close(write_out[0]));
 
-    if (dup2(read_in[1], STDOUT_FILENO) == -1) {
+    if (TEMP_FAILURE_RETRY(dup2(read_in[1], STDOUT_FILENO)) == -1) {
       ReportChildError(exec_control[1]);
     }
-    close(read_in[1]);
+    TEMP_FAILURE_RETRY(close(read_in[1]));
 
-    if (dup2(read_err[1], STDERR_FILENO) == -1) {
+    if (TEMP_FAILURE_RETRY(dup2(read_err[1], STDERR_FILENO)) == -1) {
       ReportChildError(exec_control[1]);
     }
-    close(read_err[1]);
+    TEMP_FAILURE_RETRY(close(read_err[1]));
 
-    if (working_directory != NULL && chdir(working_directory) == -1) {
+    if (working_directory != NULL &&
+        TEMP_FAILURE_RETRY(chdir(working_directory)) == -1) {
       ReportChildError(exec_control[1]);
     }
 
-    execvp(path, const_cast<char* const*>(program_arguments));
+    TEMP_FAILURE_RETRY(
+        execvp(path, const_cast<char* const*>(program_arguments)));
     ReportChildError(exec_control[1]);
   }
 
   // The arguments for the spawned process are not needed any longer.
   delete[] program_arguments;
 
   int event_fds[2];
-  result = pipe(event_fds);
+  result = TEMP_FAILURE_RETRY(pipe(event_fds));
   if (result < 0) {
     SetChildOsErrorMessage(os_error_message, os_error_message_len);
-    close(read_in[0]);
-    close(read_in[1]);
-    close(read_err[0]);
-    close(read_err[1]);
-    close(write_out[0]);
-    close(write_out[1]);
+    TEMP_FAILURE_RETRY(close(read_in[0]));
+    TEMP_FAILURE_RETRY(close(read_in[1]));
+    TEMP_FAILURE_RETRY(close(read_err[0]));
+    TEMP_FAILURE_RETRY(close(read_err[1]));
+    TEMP_FAILURE_RETRY(close(write_out[0]));
+    TEMP_FAILURE_RETRY(close(write_out[1]));
     fprintf(stderr, "Error pipe creation failed: %s\n", os_error_message);
     return errno;
   }
 
   ProcessInfo* process = new ProcessInfo(pid, event_fds[1]);
   AddProcess(process);
   *exit_event = event_fds[0];
   FDUtils::SetNonBlocking(event_fds[0]);
 
   // Notify child process to start.
   char msg = '1';
   result = FDUtils::WriteToBlocking(read_in[1], &msg, sizeof(msg));
   if (result != sizeof(msg)) {
     perror("Failed sending notification message");
   }
 
   // Read exec result from child. If no data is returned the exec was
   // successful and the exec call closed the pipe. Otherwise the errno
   // is written to the pipe.
-  close(exec_control[1]);
+  TEMP_FAILURE_RETRY(close(exec_control[1]));
   int child_errno;
   int bytes_read = -1;
   ASSERT(sizeof(child_errno) == sizeof(errno));
   bytes_read =
       FDUtils::ReadFromBlocking(
           exec_control[0], &child_errno, sizeof(child_errno));
   if (bytes_read == sizeof(child_errno)) {
       bytes_read = FDUtils::ReadFromBlocking(exec_control[0],
                                              os_error_message,
                                              os_error_message_len);
       os_error_message[os_error_message_len - 1] = '\0';
   }
-  close(exec_control[0]);
+  TEMP_FAILURE_RETRY(close(exec_control[0]));
 
   // Return error code if any failures.
   if (bytes_read != 0) {
-    close(read_in[0]);
-    close(read_in[1]);
-    close(read_err[0]);
-    close(read_err[1]);
-    close(write_out[0]);
-    close(write_out[1]);
+    TEMP_FAILURE_RETRY(close(read_in[0]));
+    TEMP_FAILURE_RETRY(close(read_in[1]));
+    TEMP_FAILURE_RETRY(close(read_err[0]));
+    TEMP_FAILURE_RETRY(close(read_err[1]));
+    TEMP_FAILURE_RETRY(close(write_out[0]));
+    TEMP_FAILURE_RETRY(close(write_out[1]));
     if (bytes_read == -1) {
       return errno;  // Read failed.
     } else {
       return child_errno;  // Exec failed.
     }
   }
 
   FDUtils::SetNonBlocking(read_in[0]);
   *in = read_in[0];
-  close(read_in[1]);
+  TEMP_FAILURE_RETRY(close(read_in[1]));
   FDUtils::SetNonBlocking(write_out[1]);
   *out = write_out[1];
-  close(write_out[0]);
+  TEMP_FAILURE_RETRY(close(write_out[0]));
   FDUtils::SetNonBlocking(read_err[0]);
   *err = read_err[0];
-  close(read_err[1]);
+  TEMP_FAILURE_RETRY(close(read_err[1]));
 
   *id = pid;
   return 0;
 }
 
 
 bool Process::Kill(intptr_t id) {
-  int result = kill(id, SIGKILL);
+  int result = TEMP_FAILURE_RETRY(kill(id, SIGKILL));
   if (result == -1) {
     return false;
   }
   return true;
 }
 
 
 void Process::Exit(intptr_t id) {
   RemoveProcess(id);
 }