Add device port unmapping support to forwarder2.

tools/android/forwarder2/host_controller.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/host_controller.h"
 
 #include <string>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "tools/android/forwarder2/command.h"
 #include "tools/android/forwarder2/forwarder.h"
 #include "tools/android/forwarder2/socket.h"
 
 namespace forwarder2 {
 
 HostController::HostController(int device_port,
                                const std::string& forward_to_host,
                                int forward_to_host_port,
                                int adb_port,
                                int exit_notifier_fd)
     : device_port_(device_port),
       forward_to_host_(forward_to_host),
       forward_to_host_port_(forward_to_host_port),
       adb_port_(adb_port),
-      exit_notifier_fd_(exit_notifier_fd),
+      global_exit_notifier_fd_(exit_notifier_fd),
       ready_(false) {
-  adb_control_socket_.set_exit_notifier_fd(exit_notifier_fd);
+  adb_control_socket_.AddEventFd(global_exit_notifier_fd_);
+  adb_control_socket_.AddEventFd(delete_controller_notifier_.receiver_fd());
 }
 
 HostController::~HostController() {
+  delete_controller_notifier_.Notify();
+  Join();
+  // Note that the Forwarder instance (that also received a delete notification)
+  // might still be running on its own thread at this point. This is not a
+  // problem since it will self-delete once the socket that it is operating on
+  // is closed.
 }
 
 void HostController::StartForwarder(
     scoped_ptr<Socket> host_server_data_socket) {
-  scoped_ptr<Socket> adb_data_socket(new Socket);
+  scoped_ptr<Socket> adb_data_socket(CreateSocket());
   if (!adb_data_socket->ConnectTcp("", adb_port_)) {
     LOG(ERROR) << "Could not connect AdbDataSocket on port: "
                << adb_port_;
     return;
   }
   // Open the Adb data connection, and send a command with the
   // |device_forward_port| as a way for the device to identify the connection.
   SendCommand(command::DATA_CONNECTION,
               device_port_,
               adb_data_socket.get());
 
   // Check that the device received the new Adb Data Connection.  Observe that
   // this check is done through the |adb_control_socket_| that is handled in the
   // DeviceListener thread just after the call to WaitForAdbDataSocket().
   if (!ReceivedCommand(command::ADB_DATA_SOCKET_SUCCESS,
                        &adb_control_socket_)) {
     LOG(ERROR) << "Device could not handle the new Adb Data Connection.";
     host_server_data_socket->Close();
     adb_data_socket->Close();
     return;
   }
   Forwarder* forwarder = new Forwarder(host_server_data_socket.Pass(),
                                        adb_data_socket.Pass());
   // Forwarder object will self delete after returning.
   forwarder->Start();
 }
 
+scoped_ptr<Socket> HostController::CreateSocket() {
+  scoped_ptr<Socket> socket(new Socket());
+  socket->AddEventFd(global_exit_notifier_fd_);
+  socket->AddEventFd(delete_controller_notifier_.receiver_fd());
+  return socket.Pass();
+}
+
 bool HostController::Connect() {
   if (!adb_control_socket_.ConnectTcp("", adb_port_)) {
     LOG(ERROR) << "Could not connect HostController socket on port: "
                << adb_port_;
     return false;
   }
   // Send the command to the device start listening to the "device_forward_port"
   bool send_command_success = SendCommand(
       command::LISTEN, device_port_, &adb_control_socket_);
   CHECK(send_command_success);
@@ skipping 10 matching lines @@
   device_port_ = device_port_allocated;
   ready_ = true;
   return true;
 }
 
 void HostController::Run() {
   CHECK(ready_) << "HostController not ready. Must call Connect() first.";
   while (true) {
     if (!ReceivedCommand(command::ACCEPT_SUCCESS,
                          &adb_control_socket_)) {
+      if (adb_control_socket_.DidReceiveEventOnFd(
+              delete_controller_notifier_.receiver_fd())) {
+        // The instance is being deleted. The control socket will be closed and
+        // the device controller will see that as an error (that it will recover
+        // from properly). TODO(pliard): tell the device controller that this is
+        // a graceful (i.e. user-intended) shutdown rather than an error.
+        break;
+      }
       // TODO(pliard): This can also happen if device_forwarder was
       // intentionally killed before host_forwarder. In that case,
       // device_forwarder should send a notification to the host.  Currently the
       // error message below is always emitted to the log file although this is
       // not necessarily an error.
       LOG(ERROR) << "Device socket error on accepting using port "
                  << device_port_;
       break;
     }
     // Try to connect to host server.
-    scoped_ptr<Socket> host_server_data_socket(new Socket);
-    host_server_data_socket->set_exit_notifier_fd(exit_notifier_fd_);
+    scoped_ptr<Socket> host_server_data_socket(CreateSocket());
     if (!host_server_data_socket->ConnectTcp(
             forward_to_host_, forward_to_host_port_)) {
       LOG(ERROR) << "Could not Connect HostServerData socket on port: "
                  << forward_to_host_port_;
       SendCommand(command::HOST_SERVER_ERROR,
                   device_port_,
                   &adb_control_socket_);
       if (ReceivedCommand(command::ACK, &adb_control_socket_)) {
         // It can continue if the host forwarder could not connect to the host
         // server but the device acknowledged that, so that the device could
         // re-try later.
         continue;
       } else {
         break;
       }
     }
     SendCommand(command::HOST_SERVER_SUCCESS,
                 device_port_,
                 &adb_control_socket_);
     StartForwarder(host_server_data_socket.Pass());
   }
   adb_control_socket_.Close();
 }
 
 }  // namespace forwarder2