Landing patch set 7 from https://codereview.chromium.org/1450113003/

runtime/bin/dbg_connection_macos.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 "platform/globals.h"
 #if defined(TARGET_OS_MACOS)
 
 #include <errno.h>  // NOLINT
 #include <stdio.h>  // NOLINT
 #include <stdlib.h>  // NOLINT
@@ skipping 72 matching lines @@
     DebuggerConnectionHandler::AcceptDbgConnection(fd);
 
     /* For now, don't poll the debugger connection.
     struct kevent ev_add;
     EV_SET(&ev_add, fd, EVFILT_READ, EV_ADD, 0, 0, NULL);
     int status =
         TEMP_FAILURE_RETRY(kevent(kqueue_fd_, &ev_add, 1, NULL, 0, NULL));
     if (status == -1) {
       const int kBufferSize = 1024;
       char error_message[kBufferSize];
-      strerror_r(errno, error_message, kBufferSize);
+      Utils::StrError(errno, error_message, kBufferSize);
       FATAL1("Failed adding debugger socket to kqueue: %s\n", error_message);
     }
     */
   } else if (ident == wakeup_fds_[0]) {
     Message msg;
     if (ReceiveMessage(&msg)) {
       Log::Print("Received sync message id %d.\n", msg.msg_id);
     }
   } else {
     Log::Print("unexpected: receiving debugger connection event.\n");
     UNIMPLEMENTED();
   }
 }
 
 
 void DebuggerConnectionImpl::Handler(uword args) {
   static const int kMaxEvents = 4;
   struct kevent events[kMaxEvents];
 
   while (1) {
     // Wait indefinitely for an event.
     int result = TEMP_FAILURE_RETRY(
         kevent(kqueue_fd_, NULL, 0, events, kMaxEvents, NULL));
     if (result == -1) {
       const int kBufferSize = 1024;
       char error_message[kBufferSize];
-      strerror_r(errno, error_message, kBufferSize);
+      Utils::StrError(errno, error_message, kBufferSize);
       FATAL1("kevent failed %s\n", error_message);
     } else {
       ASSERT(result <= kMaxEvents);
       for (int i = 0; i < result; i++) {
         HandleEvent(&events[i]);
       }
     }
   }
   Log::Print("shutting down debugger thread\n");
 }
@@ skipping 11 matching lines @@
   if (kqueue_fd_ == -1) {
     FATAL("Failed creating kqueue\n");
   }
   // Register the wakeup_fd_ with the kqueue.
   struct kevent event;
   EV_SET(&event, wakeup_fds_[0], EVFILT_READ, EV_ADD, 0, 0, NULL);
   int status = NO_RETRY_EXPECTED(kevent(kqueue_fd_, &event, 1, NULL, 0, NULL));
   if (status == -1) {
     const int kBufferSize = 1024;
     char error_message[kBufferSize];
-    strerror_r(errno, error_message, kBufferSize);
+    Utils::StrError(errno, error_message, kBufferSize);
     FATAL1("Failed adding wakeup pipe fd to kqueue: %s\n", error_message);
   }
 
   // Register the listening socket.
   EV_SET(&event, DebuggerConnectionHandler::listener_fd_,
          EVFILT_READ, EV_ADD, 0, 0, NULL);
   status = NO_RETRY_EXPECTED(kevent(kqueue_fd_, &event, 1, NULL, 0, NULL));
   if (status == -1) {
     const int kBufferSize = 1024;
     char error_message[kBufferSize];
-    strerror_r(errno, error_message, kBufferSize);
+    Utils::StrError(errno, error_message, kBufferSize);
     FATAL1("Failed adding listener socket to kqueue: %s\n", error_message);
   }
 }
 
 
 void DebuggerConnectionImpl::StartHandler(int port_number) {
   ASSERT(DebuggerConnectionHandler::listener_fd_ != -1);
   SetupPollQueue();
   int result = Thread::Start(&DebuggerConnectionImpl::Handler, 0);
   if (result != 0) {
@@ skipping 10 matching lines @@
 
 
 intptr_t DebuggerConnectionImpl::Receive(intptr_t socket, char* buf, int len) {
   return TEMP_FAILURE_RETRY(read(socket, buf, len));
 }
 
 }  // namespace bin
 }  // namespace dart
 
 #endif  // defined(TARGET_OS_MACOS)