Revised CL for customisable logging (replacing printfs).

runtime/bin/socket_android.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 <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
+#include "bin/socket.h"
 #include "bin/fdutils.h"
-#include "bin/socket.h"
+#include "bin/log.h"
 
 
 bool Socket::Initialize() {
   // Nothing to do on Android.
   return true;
 }
 
 
 intptr_t Socket::CreateConnect(const char* host, const intptr_t port) {
   intptr_t fd;
   struct hostent* server;
   struct sockaddr_in server_address;
 
   fd = TEMP_FAILURE_RETRY(socket(AF_INET, SOCK_STREAM, 0));
   if (fd < 0) {
-    fprintf(stderr, "Error CreateConnect: %s\n", strerror(errno));
+    Log::PrintErr("Error CreateConnect: %s\n", strerror(errno));
     return -1;
   }
 
   FDUtils::SetCloseOnExec(fd);
   FDUtils::SetNonBlocking(fd);
 
   server = gethostbyname(host);
   if (server == NULL) {
     TEMP_FAILURE_RETRY(close(fd));
-    fprintf(stderr, "Error CreateConnect: %s\n", strerror(errno));
+    Log::PrintErr("Error CreateConnect: %s\n", strerror(errno));
     return -1;
   }
 
   server_address.sin_family = AF_INET;
   server_address.sin_port = htons(port);
   bcopy(server->h_addr, &server_address.sin_addr.s_addr, server->h_length);
   memset(&server_address.sin_zero, 0, sizeof(server_address.sin_zero));
   intptr_t result = TEMP_FAILURE_RETRY(
       connect(fd,
               reinterpret_cast<struct sockaddr *>(&server_address),
@@ skipping 37 matching lines @@
 
 
 intptr_t Socket::GetPort(intptr_t fd) {
   ASSERT(fd >= 0);
   struct sockaddr_in socket_address;
   socklen_t size = sizeof(socket_address);
   if (TEMP_FAILURE_RETRY(
           getsockname(fd,
                       reinterpret_cast<struct sockaddr *>(&socket_address),
                       &size))) {
-    fprintf(stderr, "Error getsockname: %s\n", strerror(errno));
+    Log::PrintErr("Error getsockname: %s\n", strerror(errno));
     return 0;
   }
   return ntohs(socket_address.sin_port);
 }
 
 
 bool Socket::GetRemotePeer(intptr_t fd, char *host, intptr_t *port) {
   ASSERT(fd >= 0);
   struct sockaddr_in socket_address;
   socklen_t size = sizeof(socket_address);
   if (TEMP_FAILURE_RETRY(
           getpeername(fd,
                       reinterpret_cast<struct sockaddr *>(&socket_address),
                       &size))) {
-    fprintf(stderr, "Error getpeername: %s\n", strerror(errno));
+    Log::PrintErr("Error getpeername: %s\n", strerror(errno));
     return false;
   }
   if (inet_ntop(socket_address.sin_family,
                 reinterpret_cast<const void *>(&socket_address.sin_addr),
                 host,
                 INET_ADDRSTRLEN) == NULL) {
-    fprintf(stderr, "Error inet_ntop: %s\n", strerror(errno));
+    Log::PrintErr("Error inet_ntop: %s\n", strerror(errno));
     return false;
   }
   *port = ntohs(socket_address.sin_port);
   return true;
 }
 
 
 void Socket::GetError(intptr_t fd, OSError* os_error) {
   int errorNumber;
   socklen_t len = sizeof(errorNumber);
@@ skipping 49 matching lines @@
   intptr_t fd;
   struct sockaddr_in server_address;
 
   in_addr_t s_addr = inet_addr(host);
   if (s_addr == INADDR_NONE) {
     return -5;
   }
 
   fd = TEMP_FAILURE_RETRY(socket(AF_INET, SOCK_STREAM, 0));
   if (fd < 0) {
-    fprintf(stderr, "Error CreateBind: %s\n", strerror(errno));
+    Log::PrintErr("Error CreateBind: %s\n", strerror(errno));
     return -1;
   }
 
   FDUtils::SetCloseOnExec(fd);
 
   int optval = 1;
   TEMP_FAILURE_RETRY(
       setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &optval, sizeof(optval)));
 
   server_address.sin_family = AF_INET;
   server_address.sin_port = htons(port);
   server_address.sin_addr.s_addr = s_addr;
   memset(&server_address.sin_zero, 0, sizeof(server_address.sin_zero));
 
   if (TEMP_FAILURE_RETRY(
           bind(fd,
                reinterpret_cast<struct sockaddr *>(&server_address),
                sizeof(server_address))) < 0) {
     TEMP_FAILURE_RETRY(close(fd));
-    fprintf(stderr, "Error Bind: %s\n", strerror(errno));
+    Log::PrintErr("Error Bind: %s\n", strerror(errno));
     return -1;
   }
 
   if (TEMP_FAILURE_RETRY(listen(fd, backlog)) != 0) {
-    fprintf(stderr, "Error Listen: %s\n", strerror(errno));
+    Log::PrintErr("Error Listen: %s\n", strerror(errno));
     return -1;
   }
 
   FDUtils::SetNonBlocking(fd);
   return fd;
 }
 
 
 static bool IsTemporaryAcceptError(int error) {
   // On Android a number of protocol errors should be treated as EAGAIN.
@@ skipping 16 matching lines @@
       // 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 {
     FDUtils::SetNonBlocking(socket);
   }
   return socket;
 }