[Android] Add timeout to unmap reply handling.

tools/android/forwarder2/socket.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "tools/android/forwarder2/socket.h"
 
 #include <arpa/inet.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <netdb.h>
@@ skipping 276 matching lines @@
 
 int Socket::GetPort() {
   if (!FamilyIsTCP(family_)) {
     LOG(ERROR) << "Can't call GetPort() on an unix domain socket.";
     return 0;
   }
   return port_;
 }
 
 int Socket::ReadNumBytes(void* buffer, size_t num_bytes) {
+  return ReadNumBytesWithTimeout(buffer, num_bytes, kNoTimeout);
+}
+
+int Socket::ReadNumBytesWithTimeout(void* buffer,
+                                    size_t num_bytes,
+                                    int timeout_secs) {
   size_t bytes_read = 0;
   int ret = 1;
   while (bytes_read < num_bytes && ret > 0) {
-    ret = Read(static_cast<char*>(buffer) + bytes_read, num_bytes - bytes_read);
+    ret = ReadWithTimeout(static_cast<char*>(buffer) + bytes_read,
+                          num_bytes - bytes_read, timeout_secs);
     if (ret >= 0)
       bytes_read += ret;
   }
   return bytes_read;
 }
 
 void Socket::SetSocketError() {
   socket_error_ = true;
   DCHECK_NE(EAGAIN, errno);
   DCHECK_NE(EWOULDBLOCK, errno);
   Close();
 }
 
 int Socket::Read(void* buffer, size_t buffer_size) {
-  if (!WaitForEvent(READ, kNoTimeout)) {
+  return ReadWithTimeout(buffer, buffer_size, kNoTimeout);
+}
+
+int Socket::ReadWithTimeout(void* buffer,
+                            size_t buffer_size,
+                            int timeout_secs) {
+  if (!WaitForEvent(READ, timeout_secs)) {
     SetSocketError();
     return 0;
   }
   int ret = HANDLE_EINTR(read(socket_, buffer, buffer_size));
   if (ret < 0) {
     PLOG(ERROR) << "read";
     SetSocketError();
   }
   return ret;
 }
@@ skipping 86 matching lines @@
   timeval* tv_ptr = NULL;
   if (timeout_secs > 0) {
     tv.tv_sec = timeout_secs;
     tv.tv_usec = 0;
     tv_ptr = &tv;
   }
   int max_fd = socket_;
   for (size_t i = 0; i < events_.size(); ++i)
     if (events_[i].fd > max_fd)
       max_fd = events_[i].fd;
-  if (HANDLE_EINTR(
-          select(max_fd + 1, &read_fds, &write_fds, NULL, tv_ptr)) <= 0) {
+  if (HANDLE_EINTR(select(max_fd + 1, &read_fds, &write_fds, NULL, tv_ptr)) <

[Ted C, 2016/10/08 00:16:32]

i think the line wrapping before was easier to grok

[jbudorick, 2016/10/08 00:30:58]

as did I, but git cl format disagreed.

+      0) {
     PLOG(ERROR) << "select";
     return false;
   }
   bool event_was_fired = false;
   for (size_t i = 0; i < events_.size(); ++i) {
     if (FD_ISSET(events_[i].fd, &read_fds)) {
       events_[i].was_fired = true;
       event_was_fired = true;
     }
   }
   return !event_was_fired;
 }
 
 // static
 pid_t Socket::GetUnixDomainSocketProcessOwner(const std::string& path) {
   Socket socket;
   if (!socket.ConnectUnix(path))
     return -1;
   ucred ucred;
   socklen_t len = sizeof(ucred);
   if (getsockopt(socket.socket_, SOL_SOCKET, SO_PEERCRED, &ucred, &len) == -1) {
     CHECK_NE(ENOPROTOOPT, errno);
     return -1;
   }
   return ucred.pid;
 }
 
 }  // namespace forwarder2