Clean up fifo logcat watcher

build/android/pylib/android_commands.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.
 
 """Provides an interface to communicate with the device via the adb command.
 
 Assumes adb binary is currently on system path.
 """
 
 import collections
@@ skipping 183 matching lines @@
   Args:
     device: If given, adb commands are only send to the device of this ID.
         Otherwise commands are sent to all attached devices.
   """
 
   def __init__(self, device=None):
     self._adb = adb_interface.AdbInterface()
     if device:
       self._adb.SetTargetSerial(device)
     self._logcat = None
+    self.logcat_process = None
     self._pushed_files = []
     self._device_utc_offset = self.RunShellCommand('date +%z')[0]
     self._md5sum_path = ''
     self._external_storage = ''
 
   def Adb(self):
     """Returns our AdbInterface to avoid us wrapping all its methods."""
     return self._adb
 
   def IsRootEnabled(self):
@@ skipping 338 matching lines @@
     All pushed files can be removed by calling RemovePushedFiles().
     """
     assert os.path.exists(local_path), 'Local path not found %s' % local_path
 
     if not self._md5sum_path:
       default_build_type = os.environ.get('BUILD_TYPE', 'Debug')
       md5sum_path = '%s/out/%s/md5sum_bin' % (CHROME_SRC, default_build_type)
       if not os.path.exists(md5sum_path):
         md5sum_path = '%s/out/Release/md5sum_bin' % (CHROME_SRC)
         if not os.path.exists(md5sum_path):
-          print >>sys.stderr, 'Please build md5sum.'
+          print >> sys.stderr, 'Please build md5sum.'
           sys.exit(1)
       command = 'push %s %s' % (md5sum_path, MD5SUM_DEVICE_PATH)
       assert _HasAdbPushSucceeded(self._adb.SendCommand(command))
       self._md5sum_path = md5sum_path
 
     self._pushed_files.append(device_path)
     hashes_on_device = _ComputeFileListHash(
         self.RunShellCommand(MD5SUM_DEVICE_PATH + ' ' + device_path))
     assert os.path.exists(local_path), 'Local path not found %s' % local_path
     hashes_on_host = _ComputeFileListHash(
@@ skipping 109 matching lines @@
     args = []
     if self._adb._target_arg:
       args += shlex.split(self._adb._target_arg)
     args += ['logcat', '-v', 'threadtime']
     if filters:
       args.extend(filters)
     else:
       args.append('*:v')
 
     if logfile:
-      class NewLineNormalizer(object):
-        """A file-like object to normalize EOLs to '\n'.
-
-        Pexpect runs adb within a pseudo-tty device (see
-        http://www.noah.org/wiki/pexpect), so any '\n' printed by adb is written
-        as '\r\n' to the logfile. Since adb already uses '\r\n' to terminate
-        lines, the log ends up having '\r\r\n' at the end of each line. This
-        filter replaces the above with a single '\n' in the data stream.
-        """
-        def __init__(self, output):
-          self.output = output
-
-        def write(self, data):
-          data = data.replace('\r\r\n', '\n')
-          self.output.write(data)
-
-        def flush(self):
-          self.output.flush()
-
       logfile = NewLineNormalizer(logfile)
 
     # Spawn logcat and syncronize with it.
     for _ in range(4):
       self._logcat = pexpect.spawn('adb', args, timeout=timeout,
                                    logfile=logfile)
       self.RunShellCommand('log startup_sync')
       if self._logcat.expect(['startup_sync', pexpect.EOF,
                               pexpect.TIMEOUT]) == 0:
         break
@@ skipping 287 matching lines @@
     """
     assert '"' not in file_name, 'file_name cannot contain double quotes'
     status = self._adb.SendShellCommand(
         '\'test -e "%s"; echo $?\'' % (file_name))
     if 'test: not found' not in status:
       return int(status) == 0
 
     status = self._adb.SendShellCommand(
         '\'ls "%s" >/dev/null 2>&1; echo $?\'' % (file_name))
     return int(status) == 0
+
+
+class NewLineNormalizer(object):
+  """A file-like object to normalize EOLs to '\n'.
+
+  Pexpect runs adb within a pseudo-tty device (see
+  http://www.noah.org/wiki/pexpect), so any '\n' printed by adb is written
+  as '\r\n' to the logfile. Since adb already uses '\r\n' to terminate
+  lines, the log ends up having '\r\r\n' at the end of each line. This
+  filter replaces the above with a single '\n' in the data stream.
+  """
+  def __init__(self, output):
+    self._output = output
+
+  def write(self, data):
+    data = data.replace('\r\r\n', '\n')
+    self._output.write(data)
+
+  def flush(self):
+    self._output.flush()