Add device port unmapping support to forwarder2.

tools/android/forwarder2/host_controller.h

 // 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.
 
 #ifndef TOOLS_ANDROID_FORWARDER2_HOST_CONTROLLER_H_
 #define TOOLS_ANDROID_FORWARDER2_HOST_CONTROLLER_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
+#include "tools/android/forwarder2/pipe_notifier.h"
 #include "tools/android/forwarder2/socket.h"
 #include "tools/android/forwarder2/thread.h"
 
 namespace forwarder2 {
 
 class HostProxy;
 
 class HostController : public Thread {
  public:
   // If |device_port| is zero, it dynamically allocates a port.
@@ skipping 13 matching lines @@
   // Gets the current device allocated port. Must be called after Connect().
   int device_port() const { return device_port_; }
 
  protected:
   // Thread:
   virtual void Run() OVERRIDE;
 
  private:
   void StartForwarder(scoped_ptr<Socket> host_server_data_socket_ptr);
 
+  // Helper method that creates a socket and adds the appropriate event file
+  // descriptors.
+  scoped_ptr<Socket> CreateSocket();
+
   Socket adb_control_socket_;
   int device_port_;
   const std::string forward_to_host_;
   const int forward_to_host_port_;
   const int adb_port_;
 
-  // Used to notify the controller to exit.
-  const int exit_notifier_fd_;
+  // Used to notify the controller when the process is killed.
+  const int global_exit_notifier_fd_;
+  // Used to cancel the pending blocking IO operations when the host controller
+  // instance is deleted.
+  PipeNotifier delete_controller_notifier_;
 
   bool ready_;
 
   DISALLOW_COPY_AND_ASSIGN(HostController);
 };
 
 }  // namespace forwarder2
 
 #endif  // TOOLS_ANDROID_FORWARDER2_HOST_CONTROLLER_H_