Remove SocketData and now only pass the dart port to epoll.

runtime/bin/socket_linux.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_LINUX)
 
 #include <errno.h>  // NOLINT
 #include <stdio.h>  // NOLINT
 #include <stdlib.h>  // NOLINT
@@ skipping 42 matching lines @@
 
 
 bool Socket::Initialize() {
   // Nothing to do on Linux.
   return true;
 }
 
 
 intptr_t Socket::Create(RawAddr addr) {
   intptr_t fd;
-  fd = TEMP_FAILURE_RETRY_BLOCK_SIGNALS(socket(addr.ss.ss_family, SOCK_STREAM,
-                                               0));
+  fd = TEMP_FAILURE_RETRY_BLOCK_SIGNALS(socket(
+      addr.ss.ss_family, SOCK_STREAM | SOCK_NONBLOCK | SOCK_CLOEXEC, 0));
   if (fd < 0) {
     const int kBufferSize = 1024;
     char error_buf[kBufferSize];
     Log::PrintErr("Error Create: %s\n",
                   strerror_r(errno, error_buf, kBufferSize));
     return -1;
   }
-
-  FDUtils::SetCloseOnExec(fd);
   return fd;
 }
 
 
 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)));
   if (result == 0 || errno == EINPROGRESS) {
     return fd;
   }
   VOID_TEMP_FAILURE_RETRY_BLOCK_SIGNALS(close(fd));
   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);
-
   return Socket::Connect(fd, addr, port);
 }
 
 
 intptr_t Socket::Available(intptr_t fd) {
   return FDUtils::AvailableBytes(fd);
 }
 
 
 int Socket::Read(intptr_t fd, void* buffer, intptr_t num_bytes) {
@@ skipping 198 matching lines @@
     result = inet_pton(AF_INET6, address, &addr->in6.sin6_addr);
   }
   return result == 1;
 }
 
 
 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 = TEMP_FAILURE_RETRY_BLOCK_SIGNALS(socket(
+      addr->addr.sa_family,
+      SOCK_DGRAM | SOCK_CLOEXEC | SOCK_NONBLOCK,
+      IPPROTO_UDP));
   if (fd < 0) return -1;
 
-  FDUtils::SetCloseOnExec(fd);
-
   if (reuseAddress) {
     int optval = 1;
     VOID_TEMP_FAILURE_RETRY_BLOCK_SIGNALS(
         setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &optval, sizeof(optval)));
   }
 
   SocketAddress::SetAddrPort(addr, port);
   if (TEMP_FAILURE_RETRY_BLOCK_SIGNALS(
           bind(fd,
                &addr->addr,
                SocketAddress::GetAddrLength(addr))) < 0) {
     TEMP_FAILURE_RETRY_BLOCK_SIGNALS(close(fd));
     return -1;
   }
-
-  Socket::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 41 matching lines @@
   return addresses;
 }
 
 
 intptr_t ServerSocket::CreateBindListen(RawAddr addr,
                                         intptr_t port,
                                         intptr_t backlog,
                                         bool v6_only) {
   intptr_t fd;
 
-  fd = TEMP_FAILURE_RETRY_BLOCK_SIGNALS(socket(addr.ss.ss_family, SOCK_STREAM,
-                                               0));
+  fd = TEMP_FAILURE_RETRY_BLOCK_SIGNALS(socket(
+      addr.ss.ss_family, SOCK_STREAM | SOCK_CLOEXEC | SOCK_NONBLOCK, 0));
   if (fd < 0) return -1;
 
-  FDUtils::SetCloseOnExec(fd);
-
   int optval = 1;
   TEMP_FAILURE_RETRY_BLOCK_SIGNALS(
       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(
         setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &optval, sizeof(optval)));
   }
 
@@ skipping 16 matching lines @@
     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));
     return -1;
   }
 
-  Socket::SetNonBlocking(fd);
   return fd;
 }
 
 
 static bool IsTemporaryAcceptError(int error) {
   // On Linux a number of protocol errors should be treated as EAGAIN.
   // These are the ones for TCP/IP.
   return (error == EAGAIN) || (error == ENETDOWN) || (error == EPROTO) ||
       (error == ENOPROTOOPT) || (error == EHOSTDOWN) || (error == ENONET) ||
       (error == EHOSTUNREACH) || (error == EOPNOTSUPP) ||
       (error == ENETUNREACH);
 }
 
 
 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_BLOCK_SIGNALS(accept4(
+        fd, &clientaddr, &addrlen, SOCK_NONBLOCK | SOCK_CLOEXEC));
   if (socket == -1) {
     if (IsTemporaryAcceptError(errno)) {
       // 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);
   }
   return socket;
 }
 
 
 void Socket::Close(intptr_t fd) {
   ASSERT(fd >= 0);
   int err = TEMP_FAILURE_RETRY_BLOCK_SIGNALS(close(fd));
   if (err != 0) {
     const int kBufferSize = 1024;
     char error_buf[kBufferSize];
     Log::PrintErr("%s\n", strerror_r(errno, error_buf, kBufferSize));
   }
 }
 
 
-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 = TEMP_FAILURE_RETRY_BLOCK_SIGNALS(getsockopt(fd,
                                           IPPROTO_TCP,
                                           TCP_NODELAY,
                                           reinterpret_cast<void *>(&on),
                                           &len));
   if (err == 0) {
     *enabled = on == 1;
@@ skipping 117 matching lines @@
   mreq.gr_interface = interfaceIndex;
   memmove(&mreq.gr_group, &addr->ss, SocketAddress::GetAddrLength(addr));
   return TEMP_FAILURE_RETRY_BLOCK_SIGNALS(setsockopt(
       fd, proto, MCAST_LEAVE_GROUP, &mreq, sizeof(mreq))) == 0;
 }
 
 }  // namespace bin
 }  // namespace dart
 
 #endif  // defined(TARGET_OS_LINUX)