Revised CL for customisable logging (replacing printfs).

runtime/bin/eventhandler_linux.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 "bin/eventhandler.h"
 
 #include <errno.h>
 #include <pthread.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/epoll.h>
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <unistd.h>
 
 #include "bin/dartutils.h"
 #include "bin/fdutils.h"
+#include "bin/log.h"
 #include "platform/hashmap.h"
 #include "platform/thread.h"
 #include "platform/utils.h"
 
 
 int64_t GetCurrentTimeMilliseconds() {
   struct timeval tv;
   if (gettimeofday(&tv, NULL) < 0) {
     UNREACHABLE();
     return 0;
@@ skipping 194 matching lines @@
         // Setup events to wait for.
         sd->SetPortAndMask(msg.dart_port, msg.data);
         UpdateEpollInstance(epoll_fd_, sd);
       }
     }
   }
 }
 
 #ifdef DEBUG_POLL
 static void PrintEventMask(intptr_t fd, intptr_t events) {
-  printf("%d ", fd);
-  if ((events & EPOLLIN) != 0) printf("EPOLLIN ");
-  if ((events & EPOLLPRI) != 0) printf("EPOLLPRI ");
-  if ((events & EPOLLOUT) != 0) printf("EPOLLOUT ");
-  if ((events & EPOLLERR) != 0) printf("EPOLLERR ");
-  if ((events & EPOLLHUP) != 0) printf("EPOLLHUP ");
-  if ((events & EPOLLRDHUP) != 0) printf("EPOLLRDHUP ");
+  Log::Print("%d ", fd);
+  if ((events & EPOLLIN) != 0) Log::Print("EPOLLIN ");
+  if ((events & EPOLLPRI) != 0) Log::Print("EPOLLPRI ");
+  if ((events & EPOLLOUT) != 0) Log::Print("EPOLLOUT ");
+  if ((events & EPOLLERR) != 0) Log::Print("EPOLLERR ");
+  if ((events & EPOLLHUP) != 0) Log::Print("EPOLLHUP ");
+  if ((events & EPOLLRDHUP) != 0) Log::Print("EPOLLRDHUP ");
   int all_events = EPOLLIN | EPOLLPRI | EPOLLOUT |
       EPOLLERR | EPOLLHUP | EPOLLRDHUP;
   if ((events & ~all_events) != 0) {
-    printf("(and %08x) ", events & ~all_events);
+    Log::Print("(and %08x) ", events & ~all_events);
   }
-  printf("(available %d) ", FDUtils::AvailableBytes(fd));
+  Log::Print("(available %d) ", FDUtils::AvailableBytes(fd));
 
-  printf("\n");
+  Log::Print("\n");
 }
 #endif
 
 intptr_t EventHandlerImplementation::GetPollEvents(intptr_t events,
                                                    SocketData* sd) {
 #ifdef DEBUG_POLL
   PrintEventMask(sd->fd(), events);
 #endif
   intptr_t event_mask = 0;
   if (sd->IsListeningSocket()) {
@@ skipping 35 matching lines @@
           // recv to peek for whether the other end of the socket
           // actually closed.
           char buffer;
           ssize_t bytesPeeked =
               TEMP_FAILURE_RETRY(recv(sd->fd(), &buffer, 1, MSG_PEEK));
           ASSERT(EAGAIN == EWOULDBLOCK);
           if (bytesPeeked == 0) {
             event_mask = (1 << kCloseEvent);
             sd->MarkClosedRead();
           } else if (errno != EWOULDBLOCK) {
-            fprintf(stderr, "Error recv: %s\n", strerror(errno));
+            Log::PrintErr("Error recv: %s\n", strerror(errno));
           }
         }
       }
     }
 
     // On pipes EPOLLHUP is reported without EPOLLIN when there is no
     // more data to read.
     if (sd->IsPipe()) {
       if (((events & EPOLLIN) == 0) &&
           ((events & EPOLLHUP) != 0)) {
@@ skipping 107 matching lines @@
 void* EventHandlerImplementation::GetHashmapKeyFromFd(intptr_t fd) {
   // The hashmap does not support keys with value 0.
   return reinterpret_cast<void*>(fd + 1);
 }
 
 
 uint32_t EventHandlerImplementation::GetHashmapHashFromFd(intptr_t fd) {
   // The hashmap does not support keys with value 0.
   return dart::Utils::WordHash(fd + 1);
 }