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

runtime/bin/socket_android.cc

Index: runtime/bin/socket_android.cc
diff --git a/runtime/bin/socket_android.cc b/runtime/bin/socket_android.cc
index 0e5de6baf52e6b7ac4b9c916a3e3726e60943c89..92cb2d9555e3a96ba2d0ecadae9aca1bd0788003 100644
--- a/runtime/bin/socket_android.cc
+++ b/runtime/bin/socket_android.cc
@@ -16,9 +16,10 @@
 #include "bin/fdutils.h"
 #include "bin/file.h"
 #include "bin/log.h"
-#include "bin/signal_blocker.h"
 #include "bin/socket.h"
 
+#include "platform/signal_blocker.h"
+
 
 namespace dart {
 namespace bin {
@@ -36,13 +37,13 @@ SocketAddress::SocketAddress(struct sockaddr* sa) {
 
 bool Socket::FormatNumericAddress(RawAddr* addr, char* address, int len) {
   socklen_t salen = SocketAddress::GetAddrLength(addr);
-  if (TEMP_FAILURE_RETRY_BLOCK_SIGNALS(getnameinfo(&addr->addr,
-                                     salen,
-                                     address,
-                                     len,
-                                     NULL,
-                                     0,
-                                     NI_NUMERICHOST)) != 0) {
+  if (NO_RETRY_EXPECTED(getnameinfo(&addr->addr,
+                                    salen,
+                                    address,
+                                    len,
+                                    NULL,
+                                    0,
+                                    NI_NUMERICHOST)) != 0) {
     return false;
   }
   return true;
@@ -57,8 +58,7 @@ bool Socket::Initialize() {
 
 intptr_t Socket::Create(RawAddr addr) {
   intptr_t fd;
-  fd = TEMP_FAILURE_RETRY_BLOCK_SIGNALS(socket(addr.ss.ss_family, SOCK_STREAM,
-                                               0));
+  fd = NO_RETRY_EXPECTED(socket(addr.ss.ss_family, SOCK_STREAM, 0));
   if (fd < 0) {
     const int kBufferSize = 1024;
     char error_message[kBufferSize];
@@ -74,14 +74,12 @@ intptr_t Socket::Create(RawAddr addr) {
 
 intptr_t Socket::Connect(intptr_t fd, RawAddr addr, const intptr_t port) {
   SocketAddress::SetAddrPort(&addr, port);
-  intptr_t result = TEMP_FAILURE_RETRY_BLOCK_SIGNALS(
-      connect(fd,
-              &addr.addr,
-              SocketAddress::GetAddrLength(&addr)));
+  intptr_t result = TEMP_FAILURE_RETRY(
+      connect(fd, &addr.addr, SocketAddress::GetAddrLength(&addr)));
   if (result == 0 || errno == EINPROGRESS) {
     return fd;
   }
-  VOID_TEMP_FAILURE_RETRY_BLOCK_SIGNALS(close(fd));
+  VOID_TEMP_FAILURE_RETRY(close(fd));
   return -1;
 }
 
@@ -105,8 +103,7 @@ intptr_t Socket::Available(intptr_t fd) {
 
 int Socket::Read(intptr_t fd, void* buffer, intptr_t num_bytes) {
   ASSERT(fd >= 0);
-  ssize_t read_bytes = TEMP_FAILURE_RETRY_BLOCK_SIGNALS(read(fd, buffer,
-                                                             num_bytes));
+  ssize_t read_bytes = TEMP_FAILURE_RETRY(read(fd, buffer, num_bytes));
   ASSERT(EAGAIN == EWOULDBLOCK);
   if (read_bytes == -1 && errno == EWOULDBLOCK) {
     // If the read would block we need to retry and therefore return 0
@@ -121,9 +118,8 @@ int Socket::RecvFrom(intptr_t fd, void* buffer, intptr_t num_bytes,
                      RawAddr* addr) {
   ASSERT(fd >= 0);
   socklen_t addr_len = sizeof(addr->ss);
-  ssize_t read_bytes =
-      TEMP_FAILURE_RETRY_BLOCK_SIGNALS(
-          recvfrom(fd, buffer, num_bytes, 0, &addr->addr, &addr_len));
+  ssize_t read_bytes = TEMP_FAILURE_RETRY(
+      recvfrom(fd, buffer, num_bytes, 0, &addr->addr, &addr_len));
   if (read_bytes == -1 && errno == EWOULDBLOCK) {
     // If the read would block we need to retry and therefore return 0
     // as the number of bytes written.
@@ -135,8 +131,7 @@ int Socket::RecvFrom(intptr_t fd, void* buffer, intptr_t num_bytes,
 
 int Socket::Write(intptr_t fd, const void* buffer, intptr_t num_bytes) {
   ASSERT(fd >= 0);
-  ssize_t written_bytes = TEMP_FAILURE_RETRY_BLOCK_SIGNALS(write(fd, buffer,
-                                                                 num_bytes));
+  ssize_t written_bytes = TEMP_FAILURE_RETRY(write(fd, buffer, num_bytes));
   ASSERT(EAGAIN == EWOULDBLOCK);
   if (written_bytes == -1 && errno == EWOULDBLOCK) {
     // If the would block we need to retry and therefore return 0 as
@@ -150,10 +145,9 @@ int Socket::Write(intptr_t fd, const void* buffer, intptr_t num_bytes) {
 int Socket::SendTo(intptr_t fd, const void* buffer, intptr_t num_bytes,
                    RawAddr addr) {
   ASSERT(fd >= 0);
-  ssize_t written_bytes =
-      TEMP_FAILURE_RETRY_BLOCK_SIGNALS(
-          sendto(fd, buffer, num_bytes, 0,
-                 &addr.addr, SocketAddress::GetAddrLength(&addr)));
+  ssize_t written_bytes = TEMP_FAILURE_RETRY(
+      sendto(fd, buffer, num_bytes, 0,
+             &addr.addr, SocketAddress::GetAddrLength(&addr)));
   ASSERT(EAGAIN == EWOULDBLOCK);
   if (written_bytes == -1 && errno == EWOULDBLOCK) {
     // If the would block we need to retry and therefore return 0 as
@@ -168,10 +162,7 @@ intptr_t Socket::GetPort(intptr_t fd) {
   ASSERT(fd >= 0);
   RawAddr raw;
   socklen_t size = sizeof(raw);
-  if (TEMP_FAILURE_RETRY_BLOCK_SIGNALS(
-          getsockname(fd,
-                      &raw.addr,
-                      &size))) {
+  if (NO_RETRY_EXPECTED(getsockname(fd, &raw.addr, &size))) {
     const int kBufferSize = 1024;
     char error_message[kBufferSize];
     strerror_r(errno, error_message, kBufferSize);
@@ -186,10 +177,7 @@ SocketAddress* Socket::GetRemotePeer(intptr_t fd, intptr_t* port) {
   ASSERT(fd >= 0);
   RawAddr raw;
   socklen_t size = sizeof(raw);
-  if (TEMP_FAILURE_RETRY_BLOCK_SIGNALS(
-          getpeername(fd,
-                      &raw.addr,
-                      &size))) {
+  if (NO_RETRY_EXPECTED(getpeername(fd, &raw.addr, &size))) {
     return NULL;
   }
   *port = SocketAddress::GetAddrPort(&raw);
@@ -272,7 +260,7 @@ bool Socket::ReverseLookup(RawAddr addr,
                            intptr_t host_len,
                            OSError** os_error) {
   ASSERT(host_len >= NI_MAXHOST);
-  int status = TEMP_FAILURE_RETRY_BLOCK_SIGNALS(getnameinfo(
+  int status = NO_RETRY_EXPECTED(getnameinfo(
       &addr.addr,
       SocketAddress::GetAddrLength(&addr),
       host,
@@ -307,24 +295,23 @@ intptr_t Socket::CreateBindDatagram(
     RawAddr* addr, intptr_t port, bool reuseAddress) {
   intptr_t fd;
 
-  fd = TEMP_FAILURE_RETRY_BLOCK_SIGNALS(
-      socket(addr->addr.sa_family, SOCK_DGRAM, IPPROTO_UDP));
+  fd = NO_RETRY_EXPECTED(socket(addr->addr.sa_family, SOCK_DGRAM, IPPROTO_UDP));
   if (fd < 0) return -1;
 
   FDUtils::SetCloseOnExec(fd);
 
   if (reuseAddress) {
     int optval = 1;
-    VOID_TEMP_FAILURE_RETRY_BLOCK_SIGNALS(
+    VOID_NO_RETRY_EXPECTED(
         setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &optval, sizeof(optval)));
   }
 
   SocketAddress::SetAddrPort(addr, port);
-  if (TEMP_FAILURE_RETRY_BLOCK_SIGNALS(
+  if (NO_RETRY_EXPECTED(
           bind(fd,
                &addr->addr,
                SocketAddress::GetAddrLength(addr))) < 0) {
-    TEMP_FAILURE_RETRY_BLOCK_SIGNALS(close(fd));
+    VOID_TEMP_FAILURE_RETRY(close(fd));
     return -1;
   }
 
@@ -348,28 +335,27 @@ intptr_t ServerSocket::CreateBindListen(RawAddr addr,
                                         bool v6_only) {
   intptr_t fd;
 
-  fd = TEMP_FAILURE_RETRY_BLOCK_SIGNALS(socket(addr.ss.ss_family, SOCK_STREAM,
-                                               0));
+  fd = NO_RETRY_EXPECTED(socket(addr.ss.ss_family, SOCK_STREAM, 0));
   if (fd < 0) return -1;
 
   FDUtils::SetCloseOnExec(fd);
 
   int optval = 1;
-  TEMP_FAILURE_RETRY_BLOCK_SIGNALS(
+  VOID_NO_RETRY_EXPECTED(
       setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &optval, sizeof(optval)));
 
   if (addr.ss.ss_family == AF_INET6) {
     optval = v6_only ? 1 : 0;
-    TEMP_FAILURE_RETRY_BLOCK_SIGNALS(
+    VOID_NO_RETRY_EXPECTED(
         setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &optval, sizeof(optval)));
   }
 
   SocketAddress::SetAddrPort(&addr, port);
-  if (TEMP_FAILURE_RETRY_BLOCK_SIGNALS(
+  if (NO_RETRY_EXPECTED(
           bind(fd,
                &addr.addr,
                SocketAddress::GetAddrLength(&addr))) < 0) {
-    VOID_TEMP_FAILURE_RETRY_BLOCK_SIGNALS(close(fd));
+    VOID_TEMP_FAILURE_RETRY(close(fd));
     return -1;
   }
 
@@ -379,14 +365,13 @@ intptr_t ServerSocket::CreateBindListen(RawAddr addr,
     // that we do not get the bad port number again.
     intptr_t new_fd = CreateBindListen(addr, 0, backlog, v6_only);
     int err = errno;
-    VOID_TEMP_FAILURE_RETRY_BLOCK_SIGNALS(close(fd));
+    VOID_TEMP_FAILURE_RETRY(close(fd));
     errno = err;
     return new_fd;
   }
 
-  if (TEMP_FAILURE_RETRY_BLOCK_SIGNALS(
-      listen(fd, backlog > 0 ? backlog : SOMAXCONN)) != 0) {
-    VOID_TEMP_FAILURE_RETRY_BLOCK_SIGNALS(close(fd));
+  if (NO_RETRY_EXPECTED(listen(fd, backlog > 0 ? backlog : SOMAXCONN)) != 0) {
+    VOID_TEMP_FAILURE_RETRY(close(fd));
     return -1;
   }
 
@@ -409,7 +394,7 @@ intptr_t ServerSocket::Accept(intptr_t fd) {
   intptr_t socket;
   struct sockaddr clientaddr;
   socklen_t addrlen = sizeof(clientaddr);
-  socket = TEMP_FAILURE_RETRY_BLOCK_SIGNALS(accept(fd, &clientaddr, &addrlen));
+  socket = TEMP_FAILURE_RETRY(accept(fd, &clientaddr, &addrlen));
   if (socket == -1) {
     if (IsTemporaryAcceptError(errno)) {
       // We need to signal to the caller that this is actually not an
@@ -427,7 +412,7 @@ intptr_t ServerSocket::Accept(intptr_t fd) {
 
 void Socket::Close(intptr_t fd) {
   ASSERT(fd >= 0);
-  int err = TEMP_FAILURE_RETRY_BLOCK_SIGNALS(close(fd));
+  int err = TEMP_FAILURE_RETRY(close(fd));
   if (err != 0) {
     const int kBufferSize = 1024;
     char error_message[kBufferSize];
@@ -450,11 +435,11 @@ bool Socket::SetBlocking(intptr_t fd) {
 bool Socket::GetNoDelay(intptr_t fd, bool* enabled) {
   int on;
   socklen_t len = sizeof(on);
-  int err = TEMP_FAILURE_RETRY_BLOCK_SIGNALS(getsockopt(fd,
-                                          IPPROTO_TCP,
-                                          TCP_NODELAY,
-                                          reinterpret_cast<void *>(&on),
-                                          &len));
+  int err = NO_RETRY_EXPECTED(getsockopt(fd,
+                                         IPPROTO_TCP,
+                                         TCP_NODELAY,
+                                         reinterpret_cast<void *>(&on),
+                                         &len));
   if (err == 0) {
     *enabled = on == 1;
   }
@@ -464,11 +449,11 @@ bool Socket::GetNoDelay(intptr_t fd, bool* enabled) {
 
 bool Socket::SetNoDelay(intptr_t fd, bool enabled) {
   int on = enabled ? 1 : 0;
-  return TEMP_FAILURE_RETRY_BLOCK_SIGNALS(setsockopt(fd,
-                                       IPPROTO_TCP,
-                                       TCP_NODELAY,
-                                       reinterpret_cast<char *>(&on),
-                                       sizeof(on))) == 0;
+  return NO_RETRY_EXPECTED(setsockopt(fd,
+                                      IPPROTO_TCP,
+                                      TCP_NODELAY,
+                                      reinterpret_cast<char *>(&on),
+                                      sizeof(on))) == 0;
 }
 
 
@@ -478,11 +463,11 @@ bool Socket::GetMulticastLoop(intptr_t fd, intptr_t protocol, bool* enabled) {
   int level = protocol == SocketAddress::TYPE_IPV4 ? IPPROTO_IP : IPPROTO_IPV6;
   int optname = protocol == SocketAddress::TYPE_IPV4
       ? IP_MULTICAST_LOOP : IPV6_MULTICAST_LOOP;
-  if (TEMP_FAILURE_RETRY_BLOCK_SIGNALS(getsockopt(fd,
-                                     level,
-                                     optname,
-                                     reinterpret_cast<char *>(&on),
-                                    &len)) == 0) {
+  if (NO_RETRY_EXPECTED(getsockopt(fd,
+                                   level,
+                                   optname,
+                                   reinterpret_cast<char *>(&on),
+                                   &len)) == 0) {
     *enabled = (on == 1);
     return true;
   }
@@ -495,25 +480,24 @@ bool Socket::SetMulticastLoop(intptr_t fd, intptr_t protocol, bool enabled) {
   int level = protocol == SocketAddress::TYPE_IPV4 ? IPPROTO_IP : IPPROTO_IPV6;
   int optname = protocol == SocketAddress::TYPE_IPV4
       ? IP_MULTICAST_LOOP : IPV6_MULTICAST_LOOP;
-  return TEMP_FAILURE_RETRY_BLOCK_SIGNALS(setsockopt(fd,
-                                       level,
-                                       optname,
-                                       reinterpret_cast<char *>(&on),
-                                       sizeof(on))) == 0;
+  return NO_RETRY_EXPECTED(setsockopt(fd,
+                                      level,
+                                      optname,
+                                      reinterpret_cast<char *>(&on),
+                                      sizeof(on))) == 0;
 }
 
-
 bool Socket::GetMulticastHops(intptr_t fd, intptr_t protocol, int* value) {
   uint8_t v;
   socklen_t len = sizeof(v);
   int level = protocol == SocketAddress::TYPE_IPV4 ? IPPROTO_IP : IPPROTO_IPV6;
   int optname = protocol == SocketAddress::TYPE_IPV4
       ? IP_MULTICAST_TTL : IPV6_MULTICAST_HOPS;
-  if (TEMP_FAILURE_RETRY_BLOCK_SIGNALS(getsockopt(fd,
-                                    level,
-                                    optname,
-                                    reinterpret_cast<char *>(&v),
-                                    &len)) == 0) {
+  if (NO_RETRY_EXPECTED(getsockopt(fd,
+                                   level,
+                                   optname,
+                                   reinterpret_cast<char *>(&v),
+                                   &len)) == 0) {
     *value = v;
     return true;
   }
@@ -526,22 +510,22 @@ bool Socket::SetMulticastHops(intptr_t fd, intptr_t protocol, int value) {
   int level = protocol == SocketAddress::TYPE_IPV4 ? IPPROTO_IP : IPPROTO_IPV6;
   int optname = protocol == SocketAddress::TYPE_IPV4
       ? IP_MULTICAST_TTL : IPV6_MULTICAST_HOPS;
-  return TEMP_FAILURE_RETRY_BLOCK_SIGNALS(setsockopt(fd,
-                                       level,
-                                       optname,
-                                       reinterpret_cast<char *>(&v),
-                                       sizeof(v))) == 0;
+  return NO_RETRY_EXPECTED(setsockopt(fd,
+                                      level,
+                                      optname,
+                                      reinterpret_cast<char *>(&v),
+                                      sizeof(v))) == 0;
 }
 
 
 bool Socket::GetBroadcast(intptr_t fd, bool* enabled) {
   int on;
   socklen_t len = sizeof(on);
-  int err = TEMP_FAILURE_RETRY_BLOCK_SIGNALS(getsockopt(fd,
-                                          SOL_SOCKET,
-                                          SO_BROADCAST,
-                                          reinterpret_cast<char *>(&on),
-                                          &len));
+  int err = NO_RETRY_EXPECTED(getsockopt(fd,
+                                         SOL_SOCKET,
+                                         SO_BROADCAST,
+                                         reinterpret_cast<char *>(&on),
+                                         &len));
   if (err == 0) {
     *enabled = on == 1;
   }
@@ -551,11 +535,11 @@ bool Socket::GetBroadcast(intptr_t fd, bool* enabled) {
 
 bool Socket::SetBroadcast(intptr_t fd, bool enabled) {
   int on = enabled ? 1 : 0;
-  return TEMP_FAILURE_RETRY_BLOCK_SIGNALS(setsockopt(fd,
-                                       SOL_SOCKET,
-                                       SO_BROADCAST,
-                                       reinterpret_cast<char *>(&on),
-                                       sizeof(on))) == 0;
+  return NO_RETRY_EXPECTED(setsockopt(fd,
+                                      SOL_SOCKET,
+                                      SO_BROADCAST,
+                                      reinterpret_cast<char *>(&on),
+                                      sizeof(on))) == 0;
 }
 
 
@@ -565,7 +549,7 @@ bool Socket::JoinMulticast(
   struct group_req mreq;
   mreq.gr_interface = interfaceIndex;
   memmove(&mreq.gr_group, &addr->ss, SocketAddress::GetAddrLength(addr));
-  return TEMP_FAILURE_RETRY_BLOCK_SIGNALS(setsockopt(
+  return NO_RETRY_EXPECTED(setsockopt(
       fd, proto, MCAST_JOIN_GROUP, &mreq, sizeof(mreq))) == 0;
 }
 
@@ -576,7 +560,7 @@ bool Socket::LeaveMulticast(
   struct group_req mreq;
   mreq.gr_interface = interfaceIndex;
   memmove(&mreq.gr_group, &addr->ss, SocketAddress::GetAddrLength(addr));
-  return TEMP_FAILURE_RETRY_BLOCK_SIGNALS(setsockopt(
+  return NO_RETRY_EXPECTED(setsockopt(
       fd, proto, MCAST_LEAVE_GROUP, &mreq, sizeof(mreq))) == 0;
 }