Remove SetNonBlocking/SetBlocking methods from Socket and add missing close-on-exec

runtime/bin/socket_macos.cc

 // Copyright (c) 2013, 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_MACOS)
 
 #include <errno.h>  // NOLINT
 #include <stdio.h>  // NOLINT
 #include <stdlib.h>  // NOLINT
@@ skipping 68 matching lines @@
   return -1;
 }
 
 
 intptr_t Socket::CreateConnect(RawAddr addr, const intptr_t port) {
   intptr_t fd = Socket::Create(addr);
   if (fd < 0) {
     return fd;
   }
 
-  Socket::SetNonBlocking(fd);
+  FDUtils::SetNonBlocking(fd);
 
   return Socket::Connect(fd, addr, port);
 }
 
 
 intptr_t Socket::Available(intptr_t fd) {
   return FDUtils::AvailableBytes(fd);
 }
 
 
@@ skipping 191 matching lines @@
         setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &optval, sizeof(optval)));
   }
 
   SocketAddress::SetAddrPort(addr, port);
   if (NO_RETRY_EXPECTED(
           bind(fd, &addr->addr, SocketAddress::GetAddrLength(addr))) < 0) {
     VOID_TEMP_FAILURE_RETRY(close(fd));
     return -1;
   }
 
-  Socket::SetNonBlocking(fd);
+  FDUtils::SetNonBlocking(fd);
   return fd;
 }
 
 
 static bool ShouldIncludeIfaAddrs(struct ifaddrs* ifa, int lookup_family) {
   if (ifa->ifa_addr == NULL) {
     // OpenVPN's virtual device tun0.
     return false;
   }
   int family = ifa->ifa_addr->sa_family;
@@ skipping 79 matching lines @@
     VOID_TEMP_FAILURE_RETRY(close(fd));
     errno = err;
     return new_fd;
   }
 
   if (NO_RETRY_EXPECTED(listen(fd, backlog > 0 ? backlog : SOMAXCONN)) != 0) {
     VOID_TEMP_FAILURE_RETRY(close(fd));
     return -1;
   }
 
-  Socket::SetNonBlocking(fd);
+  FDUtils::SetNonBlocking(fd);
   return fd;
 }
 
 
 bool ServerSocket::StartAccept(intptr_t fd) {
   USE(fd);
   return true;
 }
 
 
 intptr_t ServerSocket::Accept(intptr_t fd) {
   intptr_t socket;
   struct sockaddr clientaddr;
   socklen_t addrlen = sizeof(clientaddr);
   socket = TEMP_FAILURE_RETRY(accept(fd, &clientaddr, &addrlen));
   if (socket == -1) {
     if (errno == EAGAIN) {
       // We need to signal to the caller that this is actually not an
       // error. We got woken up from the poll on the listening socket,
       // but there is no connection ready to be accepted.
       ASSERT(kTemporaryFailure != -1);
       socket = kTemporaryFailure;
     }
   } else {
-    Socket::SetNonBlocking(socket);
+    FDUtils::SetNonBlocking(socket);
+    FDUtils::SetCloseOnExec(socket);

[kustermann, 2015/02/09 16:25:32]

ditto.

[Søren Gjesse, 2015/02/10 07:28:15]

Done.

   }
   return socket;
 }
 
 
 void Socket::Close(intptr_t fd) {
   ASSERT(fd >= 0);
   VOID_TEMP_FAILURE_RETRY(close(fd));
 }
 
 
-bool Socket::SetNonBlocking(intptr_t fd) {
-  return FDUtils::SetNonBlocking(fd);
-}
-
-
-bool Socket::SetBlocking(intptr_t fd) {
-  return FDUtils::SetBlocking(fd);
-}
-
-
 bool Socket::GetNoDelay(intptr_t fd, bool* enabled) {
   int on;
   socklen_t len = sizeof(on);
   int err = NO_RETRY_EXPECTED(getsockopt(fd,
                                          IPPROTO_TCP,
                                          TCP_NODELAY,
                                          reinterpret_cast<void *>(&on),
                                          &len));
   if (err == 0) {
     *enabled = on == 1;
@@ skipping 145 matching lines @@
 
 bool Socket::LeaveMulticast(
     intptr_t fd, RawAddr* addr, RawAddr* interface, int interfaceIndex) {
   return JoinOrLeaveMulticast(fd, addr, interface, interfaceIndex, false);
 }
 
 }  // namespace bin
 }  // namespace dart
 
 #endif  // defined(TARGET_OS_MACOS)