Relands Android perf tests: kill adbd on the device after running a test.

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
 import datetime
 import logging
 import os
 import re
 import shlex
+import signal
 import subprocess
 import sys
 import tempfile
 import time
 
 import cmd_helper
 import constants
 try:
   from pylib import pexpect
 except:
@@ skipping 425 matching lines @@
         # Force a hard reboot on last attempt
         self.Reboot(full_reboot=(reboots_left == 1))
         reboots_left -= 1
 
   def MakeSystemFolderWritable(self):
     """Remounts the /system folder rw."""
     out = self._adb.SendCommand('remount')
     if out.strip() != 'remount succeeded':
       raise errors.MsgException('Remount failed: %s' % out)
 
+  def RestartAdbdOnDevice(self):
+    logging.info('Killing adbd on the device...')
+    adb_pids = self.KillAll('adbd', signal=signal.SIGTERM, with_su=True)
+    assert adb_pids, 'Unable to obtain adbd pid'
+    logging.info('Waiting for device to settle...')
+    self._adb.SendCommand('wait-for-device')
+
   def RestartAdbServer(self):
     """Restart the adb server."""
     ret = self.KillAdbServer()
     if ret != 0:
       raise errors.MsgException('KillAdbServer: %d' % ret)
 
     ret = self.StartAdbServer()
     if ret != 0:
       raise errors.MsgException('StartAdbServer: %d' % ret)
 
@@ skipping 118 matching lines @@
     last_line = lines[-1]
     status_pos = last_line.rfind('%')
     assert status_pos >= 0
     status = int(last_line[status_pos + 1:])
     if status_pos == 0:
       lines = lines[:-1]
     else:
       lines = lines[:-1] + [last_line[:status_pos]]
     return (status, lines)
 
-  def KillAll(self, process):
+  def KillAll(self, process, signal=9, with_su=False):
     """Android version of killall, connected via adb.
 
     Args:
-      process: name of the process to kill off
+      process: name of the process to kill off.
+      signal: signal to use, 9 (SIGKILL) by default.
+      with_su: wether or not to use su to kill the processes.
 
     Returns:
       the number of processes killed
     """
     pids = self.ExtractPid(process)
     if pids:
-      self.RunShellCommand('kill -9 ' + ' '.join(pids))
+      cmd = 'kill -%d %s' % (signal, ' '.join(pids))
+      if with_su:
+        self.RunShellCommandWithSU(cmd)
+      else:
+        self.RunShellCommand(cmd)
     return len(pids)
 
   def KillAllBlocking(self, process, timeout_sec):
     """Blocking version of killall, connected via adb.
 
     This waits until no process matching the corresponding name appears in ps'
     output anymore.
 
     Args:
       process: name of the process to kill off
@@ skipping 1020 matching lines @@
   """
   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()