Pulled a significant portion of Socket implementation into BaseSocket in order to prepare for the s…

runtime/bin/socket_common_macos.cc

Index: runtime/bin/socket_common_macos.cc
diff --git a/runtime/bin/socket_macos.cc b/runtime/bin/socket_common_macos.cc
similarity index 83%
rename from runtime/bin/socket_macos.cc
rename to runtime/bin/socket_common_macos.cc
index c1f48ccae7612aadba9c169f51dd3e0db6790e36..c5ab05bfc64da7e29f3f592a46a79baf597fdaf2 100644
--- a/runtime/bin/socket_macos.cc
+++ b/runtime/bin/socket_common_macos.cc
@@ -8,7 +8,7 @@
 #if defined(TARGET_OS_MACOS)
 
 #include "bin/socket.h"
-#include "bin/socket_macos.h"
+#include "bin/socket_common_macos.h"
 
 #include <errno.h>        // NOLINT
 #include <ifaddrs.h>      // NOLINT
@@ -29,8 +29,8 @@ namespace bin {
 
 SocketAddress::SocketAddress(struct sockaddr* sa) {
   ASSERT(INET6_ADDRSTRLEN >= INET_ADDRSTRLEN);
-  if (!Socket::FormatNumericAddress(*reinterpret_cast<RawAddr*>(sa), as_string_,
-                                    INET6_ADDRSTRLEN)) {
+  if (!BaseSocket::FormatNumericAddress(*reinterpret_cast<RawAddr*>(sa),
+                                        as_string_, INET6_ADDRSTRLEN)) {
     as_string_[0] = 0;
   }
   socklen_t salen = GetAddrLength(*reinterpret_cast<RawAddr*>(sa));
@@ -38,14 +38,16 @@ SocketAddress::SocketAddress(struct sockaddr* sa) {
 }
 
 
-bool Socket::FormatNumericAddress(const RawAddr& addr, char* address, int len) {
+bool BaseSocket::FormatNumericAddress(const RawAddr& addr,
+                                      char* address,
+                                      int len) {
   socklen_t salen = SocketAddress::GetAddrLength(addr);
   return (NO_RETRY_EXPECTED(getnameinfo(&addr.addr, salen, address, len, NULL,
                                         0, NI_NUMERICHOST)) == 0);
 }
 
 
-bool Socket::Initialize() {
+bool BaseSocket::Initialize() {
   // Nothing to do on Mac OS.
   return true;
 }
@@ -108,18 +110,18 @@ intptr_t Socket::CreateBindConnect(const RawAddr& addr,
 }
 
 
-bool Socket::IsBindError(intptr_t error_number) {
+bool BaseSocket::IsBindError(intptr_t error_number) {
   return error_number == EADDRINUSE || error_number == EADDRNOTAVAIL ||
          error_number == EINVAL;
 }
 
 
-intptr_t Socket::Available(intptr_t fd) {
+intptr_t BaseSocket::Available(intptr_t fd) {
   return FDUtils::AvailableBytes(fd);
 }
 
 
-intptr_t Socket::Read(intptr_t fd, void* buffer, intptr_t num_bytes) {
+intptr_t BaseSocket::Read(intptr_t fd, void* buffer, intptr_t num_bytes) {
   ASSERT(fd >= 0);
   ssize_t read_bytes = TEMP_FAILURE_RETRY(read(fd, buffer, num_bytes));
   ASSERT(EAGAIN == EWOULDBLOCK);
@@ -132,10 +134,10 @@ intptr_t Socket::Read(intptr_t fd, void* buffer, intptr_t num_bytes) {
 }
 
 
-intptr_t Socket::RecvFrom(intptr_t fd,
-                          void* buffer,
-                          intptr_t num_bytes,
-                          RawAddr* addr) {
+intptr_t BaseSocket::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(
@@ -149,7 +151,9 @@ intptr_t Socket::RecvFrom(intptr_t fd,
 }
 
 
-intptr_t Socket::Write(intptr_t fd, const void* buffer, intptr_t num_bytes) {
+intptr_t BaseSocket::Write(intptr_t fd,
+                           const void* buffer,
+                           intptr_t num_bytes) {
   ASSERT(fd >= 0);
   ssize_t written_bytes = TEMP_FAILURE_RETRY(write(fd, buffer, num_bytes));
   ASSERT(EAGAIN == EWOULDBLOCK);
@@ -162,10 +166,10 @@ intptr_t Socket::Write(intptr_t fd, const void* buffer, intptr_t num_bytes) {
 }
 
 
-intptr_t Socket::SendTo(intptr_t fd,
-                        const void* buffer,
-                        intptr_t num_bytes,
-                        const RawAddr& addr) {
+intptr_t BaseSocket::SendTo(intptr_t fd,
+                            const void* buffer,
+                            intptr_t num_bytes,
+                            const RawAddr& addr) {
   ASSERT(fd >= 0);
   ssize_t written_bytes =
       TEMP_FAILURE_RETRY(sendto(fd, buffer, num_bytes, 0, &addr.addr,
@@ -180,7 +184,7 @@ intptr_t Socket::SendTo(intptr_t fd,
 }
 
 
-intptr_t Socket::GetPort(intptr_t fd) {
+intptr_t BaseSocket::GetPort(intptr_t fd) {
   ASSERT(fd >= 0);
   RawAddr raw;
   socklen_t size = sizeof(raw);
@@ -191,7 +195,7 @@ intptr_t Socket::GetPort(intptr_t fd) {
 }
 
 
-SocketAddress* Socket::GetRemotePeer(intptr_t fd, intptr_t* port) {
+SocketAddress* BaseSocket::GetRemotePeer(intptr_t fd, intptr_t* port) {
   ASSERT(fd >= 0);
   RawAddr raw;
   socklen_t size = sizeof(raw);
@@ -203,7 +207,7 @@ SocketAddress* Socket::GetRemotePeer(intptr_t fd, intptr_t* port) {
 }
 
 
-void Socket::GetError(intptr_t fd, OSError* os_error) {
+void BaseSocket::GetError(intptr_t fd, OSError* os_error) {
   int len = sizeof(errno);
   getsockopt(fd, SOL_SOCKET, SO_ERROR, &errno,
              reinterpret_cast<socklen_t*>(&len));
@@ -211,7 +215,7 @@ void Socket::GetError(intptr_t fd, OSError* os_error) {
 }
 
 
-int Socket::GetType(intptr_t fd) {
+int BaseSocket::GetType(intptr_t fd) {
   struct stat buf;
   int result = fstat(fd, &buf);
   if (result == -1) {
@@ -230,14 +234,14 @@ int Socket::GetType(intptr_t fd) {
 }
 
 
-intptr_t Socket::GetStdioHandle(intptr_t num) {
+intptr_t BaseSocket::GetStdioHandle(intptr_t num) {
   return num;
 }
 
 
-AddressList<SocketAddress>* Socket::LookupAddress(const char* host,
-                                                  int type,
-                                                  OSError** os_error) {
+AddressList<SocketAddress>* BaseSocket::LookupAddress(const char* host,
+                                                      int type,
+                                                      OSError** os_error) {
   // Perform a name lookup for a host name.
   struct addrinfo hints;
   memset(&hints, 0, sizeof(hints));
@@ -272,10 +276,10 @@ AddressList<SocketAddress>* Socket::LookupAddress(const char* host,
 }
 
 
-bool Socket::ReverseLookup(const RawAddr& addr,
-                           char* host,
-                           intptr_t host_len,
-                           OSError** os_error) {
+bool BaseSocket::ReverseLookup(const RawAddr& addr,
+                               char* host,
+                               intptr_t host_len,
+                               OSError** os_error) {
   ASSERT(host_len >= NI_MAXHOST);
   int status = NO_RETRY_EXPECTED(
       getnameinfo(&addr.addr, SocketAddress::GetAddrLength(addr), host,
@@ -290,7 +294,7 @@ bool Socket::ReverseLookup(const RawAddr& addr,
 }
 
 
-bool Socket::ParseAddress(int type, const char* address, RawAddr* addr) {
+bool BaseSocket::ParseAddress(int type, const char* address, RawAddr* addr) {
   int result;
   if (type == SocketAddress::TYPE_IPV4) {
     result = inet_pton(AF_INET, address, &addr->in.sin_addr);
@@ -347,12 +351,12 @@ static bool ShouldIncludeIfaAddrs(struct ifaddrs* ifa, int lookup_family) {
 }
 
 
-bool Socket::ListInterfacesSupported() {
+bool BaseSocket::ListInterfacesSupported() {
   return true;
 }
 
 
-AddressList<InterfaceSocketAddress>* Socket::ListInterfaces(
+AddressList<InterfaceSocketAddress>* BaseSocket::ListInterfaces(
     int type,
     OSError** os_error) {
   struct ifaddrs* ifaddr;
@@ -424,7 +428,7 @@ intptr_t ServerSocket::CreateBindListen(const RawAddr& addr,
 
   // Test for invalid socket port 65535 (some browsers disallow it).
   if ((SocketAddress::GetAddrPort(addr) == 0) &&
-      (Socket::GetPort(fd) == 65535)) {
+      (BaseSocket::GetPort(fd) == 65535)) {
     // Don't close the socket until we have created a new socket, ensuring
     // that we do not get the bad port number again.
     intptr_t new_fd = CreateBindListen(addr, backlog, v6_only);
@@ -478,13 +482,13 @@ intptr_t ServerSocket::Accept(intptr_t fd) {
 }
 
 
-void Socket::Close(intptr_t fd) {
+void BaseSocket::Close(intptr_t fd) {
   ASSERT(fd >= 0);
   VOID_TEMP_FAILURE_RETRY(close(fd));
 }
 
 
-bool Socket::GetNoDelay(intptr_t fd, bool* enabled) {
+bool BaseSocket::GetNoDelay(intptr_t fd, bool* enabled) {
   int on;
   socklen_t len = sizeof(on);
   int err = NO_RETRY_EXPECTED(getsockopt(fd, IPPROTO_TCP, TCP_NODELAY,
@@ -496,7 +500,7 @@ bool Socket::GetNoDelay(intptr_t fd, bool* enabled) {
 }
 
 
-bool Socket::SetNoDelay(intptr_t fd, bool enabled) {
+bool BaseSocket::SetNoDelay(intptr_t fd, bool enabled) {
   int on = enabled ? 1 : 0;
   return NO_RETRY_EXPECTED(setsockopt(fd, IPPROTO_TCP, TCP_NODELAY,
                                       reinterpret_cast<char*>(&on),
@@ -504,7 +508,9 @@ bool Socket::SetNoDelay(intptr_t fd, bool enabled) {
 }
 
 
-bool Socket::GetMulticastLoop(intptr_t fd, intptr_t protocol, bool* enabled) {
+bool BaseSocket::GetMulticastLoop(intptr_t fd,
+                                  intptr_t protocol,
+                                  bool* enabled) {
   uint8_t on;
   socklen_t len = sizeof(on);
   int level = protocol == SocketAddress::TYPE_IPV4 ? IPPROTO_IP : IPPROTO_IPV6;
@@ -519,7 +525,9 @@ bool Socket::GetMulticastLoop(intptr_t fd, intptr_t protocol, bool* enabled) {
 }
 
 
-bool Socket::SetMulticastLoop(intptr_t fd, intptr_t protocol, bool enabled) {
+bool BaseSocket::SetMulticastLoop(intptr_t fd,
+                                  intptr_t protocol,
+                                  bool enabled) {
   u_int on = enabled ? 1 : 0;
   int level = protocol == SocketAddress::TYPE_IPV4 ? IPPROTO_IP : IPPROTO_IPV6;
   int optname = protocol == SocketAddress::TYPE_IPV4 ? IP_MULTICAST_LOOP
@@ -530,7 +538,7 @@ bool Socket::SetMulticastLoop(intptr_t fd, intptr_t protocol, bool enabled) {
 }
 
 
-bool Socket::GetMulticastHops(intptr_t fd, intptr_t protocol, int* value) {
+bool BaseSocket::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;
@@ -545,7 +553,7 @@ bool Socket::GetMulticastHops(intptr_t fd, intptr_t protocol, int* value) {
 }
 
 
-bool Socket::SetMulticastHops(intptr_t fd, intptr_t protocol, int value) {
+bool BaseSocket::SetMulticastHops(intptr_t fd, intptr_t protocol, int value) {
   int v = value;
   int level = protocol == SocketAddress::TYPE_IPV4 ? IPPROTO_IP : IPPROTO_IPV6;
   int optname = protocol == SocketAddress::TYPE_IPV4 ? IP_MULTICAST_TTL
@@ -555,7 +563,7 @@ bool Socket::SetMulticastHops(intptr_t fd, intptr_t protocol, int value) {
 }
 
 
-bool Socket::GetBroadcast(intptr_t fd, bool* enabled) {
+bool BaseSocket::GetBroadcast(intptr_t fd, bool* enabled) {
   int on;
   socklen_t len = sizeof(on);
   int err = NO_RETRY_EXPECTED(getsockopt(fd, SOL_SOCKET, SO_BROADCAST,
@@ -567,7 +575,7 @@ bool Socket::GetBroadcast(intptr_t fd, bool* enabled) {
 }
 
 
-bool Socket::SetBroadcast(intptr_t fd, bool enabled) {
+bool BaseSocket::SetBroadcast(intptr_t fd, bool enabled) {
   int on = enabled ? 1 : 0;
   return NO_RETRY_EXPECTED(setsockopt(fd, SOL_SOCKET, SO_BROADCAST,
                                       reinterpret_cast<char*>(&on),
@@ -610,18 +618,18 @@ static bool JoinOrLeaveMulticast(intptr_t fd,
   }
 }
 
-bool Socket::JoinMulticast(intptr_t fd,
-                           const RawAddr& addr,
-                           const RawAddr& interface,
-                           int interfaceIndex) {
+bool BaseSocket::JoinMulticast(intptr_t fd,
+                               const RawAddr& addr,
+                               const RawAddr& interface,
+                               int interfaceIndex) {
   return JoinOrLeaveMulticast(fd, addr, interface, interfaceIndex, true);
 }
 
 
-bool Socket::LeaveMulticast(intptr_t fd,
-                            const RawAddr& addr,
-                            const RawAddr& interface,
-                            int interfaceIndex) {
+bool BaseSocket::LeaveMulticast(intptr_t fd,
+                                const RawAddr& addr,
+                                const RawAddr& interface,
+                                int interfaceIndex) {
   return JoinOrLeaveMulticast(fd, addr, interface, interfaceIndex, false);
 }