Android: fix cpu governor setup for perf tests

build/android/pylib/perf_tests_helper.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 re
 
 import android_commands
 import json
 import math
 
@@ skipping 112 matching lines @@
   return output
 
 
 class PerfTestSetup(object):
   """Provides methods for setting up a device for perf testing."""
   _DROP_CACHES = '/proc/sys/vm/drop_caches'
   _SCALING_GOVERNOR = '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor'
 
   def __init__(self, adb):
     self._adb = adb
-    num_cpus = self._adb.GetFileContents('/sys/devices/system/cpu/online',
+    kernel_max = self._adb.GetFileContents('/sys/devices/system/cpu/kernel_max',
                                          log_result=False)
-    assert num_cpus, 'Unable to find /sys/devices/system/cpu/online'
-    self._num_cpus = int(num_cpus[0].split('-')[-1])
+    assert kernel_max, 'Unable to find /sys/devices/system/cpu/kernel_max'
+    self._kernel_max = int(kernel_max[0])
     self._original_scaling_governor = None
 
   def DropRamCaches(self):
     """Drops the filesystem ram caches for performance testing."""
     if not self._adb.IsRootEnabled():
       self._adb.EnableAdbRoot()
     self._adb.RunShellCommand('sync')
     self._adb.RunShellCommand('echo 3 > ' + PerfTestSetup._DROP_CACHES)
 
   def SetUp(self):
     """Sets up performance tests."""
     if not self._original_scaling_governor:
       self._original_scaling_governor = self._adb.GetFileContents(
           PerfTestSetup._SCALING_GOVERNOR % 0,
           log_result=False)[0]
       self._SetScalingGovernorInternal('performance')
     self.DropRamCaches()
 
   def TearDown(self):
     """Tears down performance tests."""
     if self._original_scaling_governor:
       self._SetScalingGovernorInternal(self._original_scaling_governor)
     self._original_scaling_governor = None
 
   def _SetScalingGovernorInternal(self, value):
-    for cpu in range(self._num_cpus):
-      self._adb.RunShellCommand(
-          ('echo %s > ' + PerfTestSetup._SCALING_GOVERNOR) % (value, cpu))
+    for cpu in range(self._kernel_max + 1):
+      scaling_governor = PerfTestSetup._SCALING_GOVERNOR % cpu

[bulach, 2013/01/16 09:34:15]

hehe, probably best to:
scaling_governor_file = PerfTestSetup._SCALING_GOVERNOR_FMT % cpu

that is, add suffixes for "_file" and "_FMT".
the ambiguous format / mod operation got me wondering... :)

+      if self._adb.Adb().DoesFileExist(scaling_governor):
+        self._adb.RunShellCommand(
+            ('echo %s > ' + scaling_governor) % value)