Move signal_blocker to platform and use it by default in TEMP_FAILURE_RETRY.

runtime/bin/dbg_connection_linux.cc

 // 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 "platform/globals.h"
 #if defined(TARGET_OS_LINUX)
 
 #include <errno.h>  // NOLINT
 #include <stdio.h>  // NOLINT
 #include <stdlib.h>  // NOLINT
 #include <sys/epoll.h>  // NOLINT
 
+#include "platform/signal_blocker.h"
 #include "bin/dbg_connection.h"
 #include "bin/fdutils.h"
 #include "bin/log.h"
 #include "bin/socket.h"
 
 
 namespace dart {
 namespace bin {
 
 int DebuggerConnectionImpl::epoll_fd_ = -1;
@@ skipping 39 matching lines @@
       ASSERT(result <= kMaxEvents);
       for (int i = 0; i < result; i++) {
         HandleEvent(&events[i]);
       }
     }
   }
 }
 
 
 void DebuggerConnectionImpl::SetupPollQueue() {
-  int result = TEMP_FAILURE_RETRY(pipe(wakeup_fds_));
+  int result = pipe(wakeup_fds_);

[Søren Gjesse, 2014/02/20 15:09:09]

Should we add a NO_RETRY_EXPECTED macro to sanity-check this?

One that in DEBUG mode checks that EINTR is never returned, and does nothing in
release mode.

The man-pages could be inaccurate...?

[Anders Johnsen, 2014/02/20 15:10:17]

Good idea - will into that tomorrow.

[Cutch, 2014/02/20 15:20:01]

+1

   if (result != 0) {
     FATAL1("Pipe creation failed with error %d\n", result);
   }
   FDUtils::SetNonBlocking(wakeup_fds_[0]);
 
   static const int kEpollInitialSize = 16;
-  epoll_fd_ = TEMP_FAILURE_RETRY(epoll_create(kEpollInitialSize));
+  epoll_fd_ = epoll_create(kEpollInitialSize);
   if (epoll_fd_ == -1) {
     FATAL("Failed creating epoll file descriptor");
   }
 
   // Register the wakeup _fd with the epoll instance.
   struct epoll_event event;
   event.events = EPOLLIN;
   event.data.fd = wakeup_fds_[0];
-  int status = TEMP_FAILURE_RETRY(epoll_ctl(
-                   epoll_fd_, EPOLL_CTL_ADD, wakeup_fds_[0], &event));
+  int status = epoll_ctl(epoll_fd_, EPOLL_CTL_ADD, wakeup_fds_[0], &event);
   if (status == -1) {
     FATAL("Failed adding wakeup fd to epoll instance");
   }
 
   // Register the listener_fd with the epoll instance.
   event.events = EPOLLIN;
   event.data.fd = DebuggerConnectionHandler::listener_fd_;
-  status = TEMP_FAILURE_RETRY(epoll_ctl(epoll_fd_, EPOLL_CTL_ADD,
-               DebuggerConnectionHandler::listener_fd_, &event));
+  status = epoll_ctl(epoll_fd_, EPOLL_CTL_ADD,
+      DebuggerConnectionHandler::listener_fd_, &event);
   if (status == -1) {
     FATAL("Failed adding listener fd to epoll instance");
   }
 }
 
 
 void DebuggerConnectionImpl::StartHandler(int port_number) {
   ASSERT(DebuggerConnectionHandler::listener_fd_ != -1);
   SetupPollQueue();
   int result = dart::Thread::Start(&DebuggerConnectionImpl::Handler, 0);
@@ skipping 11 matching lines @@
 
 
 intptr_t DebuggerConnectionImpl::Receive(intptr_t socket, char* buf, int len) {
   return TEMP_FAILURE_RETRY(read(socket, buf, len));
 }
 
 }  // namespace bin
 }  // namespace dart
 
 #endif  // defined(TARGET_OS_LINUX)