Add device port unmapping support to forwarder2.

build/android/pylib/forwarder.py

 # 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.
 
 import logging
 import os
 import re
 import sys
 import time
 
@@ skipping 49 matching lines @@
                  get the number of the assigned port using the
                  DevicePortForHostPort method.
       tool: Tool class to use to get wrapper, if necessary, for executing the
             forwarder (see valgrind_tools.py).
       host_name: Address to forward to, must be addressable from the
                  host machine. Usually use loopback '127.0.0.1'.
 
     Raises:
       Exception on failure to forward the port.
     """
-    host_adb_control_port = ports.AllocateTestServerPort()
-    if not host_adb_control_port:
+    self._host_adb_control_port = ports.AllocateTestServerPort()
+    if not self._host_adb_control_port:
       raise Exception('Failed to allocate a TCP port in the host machine.')
     self._adb.PushIfNeeded(
         self._device_forwarder_path_on_host, Forwarder._DEVICE_FORWARDER_FOLDER)
     redirection_commands = [
-        '%d:%d:%d:%s' % (host_adb_control_port, device, host,
+        '%d:%d:%d:%s' % (self._host_adb_control_port, device, host,
                          host_name) for device, host in port_pairs]
     logging.info('Command format: <ADB port>:<Device port>' +
                  '[:<Forward to port>:<Forward to address>]')
     logging.info('Forwarding using commands: %s', redirection_commands)
     if cmd_helper.RunCmd(
         ['adb', '-s', self._adb._adb.GetSerialNumber(), 'forward',
-         'tcp:%s' % host_adb_control_port,
+         'tcp:%s' % self._host_adb_control_port,
          'localabstract:%s' % Forwarder._DEVICE_ADB_CONTROL_PORT]) != 0:
       raise Exception('Error while running adb forward.')
 
     (exit_code, output) = self._adb.GetShellCommandStatusAndOutput(
         '%s %s %s %s' % (Forwarder._LD_LIBRARY_PATH, tool.GetUtilWrapper(),
                          Forwarder._DEVICE_FORWARDER_PATH,
                          Forwarder._DEVICE_ADB_CONTROL_PORT))
     if exit_code != 0:
       raise Exception(
           'Failed to start device forwarder:\n%s' % '\n'.join(output))
@@ skipping 13 matching lines @@
       tokens = output.split(':')
       if len(tokens) != 2:
         raise Exception('Unexpected host forwarder output "%s", ' +
                         'expected "device_port:host_port"' % output)
       device_port = int(tokens[0])
       host_port = int(tokens[1])
       self._host_to_device_port_map[host_port] = device_port
       logging.info('Forwarding device port: %d to host port: %d.', device_port,
                    host_port)
 
+  def UnmapDevicePort(self, device_port):
+    # Please note the minus sign below.
+    redirection_command = '%d:-%d' % (self._host_adb_control_port, device_port)
+    (exit_code, output) = cmd_helper.GetCmdStatusAndOutput(
+        [self._host_forwarder_path, redirection_command])
+    if exit_code != 0:
+      raise Exception('%s exited with %d:\n%s' % (
+          self._host_forwarder_path, exit_code, '\n'.join(output)))
+
   @staticmethod
   def KillHost(build_type):
     logging.info('Killing host_forwarder.')
     host_forwarder_path = _MakeBinaryPath(build_type, 'host_forwarder')
     assert os.path.exists(host_forwarder_path), 'Please build forwarder2'
     (exit_code, output) = cmd_helper.GetCmdStatusAndOutput(
         [host_forwarder_path, 'kill-server'])
     if exit_code != 0:
       (exit_code, output) = cmd_helper.GetCmdStatusAndOutput(
           ['pkill', 'host_forwarder'])
@@ skipping 21 matching lines @@
 
   def DevicePortForHostPort(self, host_port):
     """Get the device port that corresponds to a given host port."""
     return self._host_to_device_port_map.get(host_port)
 
   def Close(self):
     """Terminate the forwarder process."""
     if self._device_process:
       self._device_process.close()
       self._device_process = None