Tweak CPU support; list all available CPU frequencies.

appengine/third_party/python-adb/adb/high.py

 # Copyright 2015 Google Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ skipping 126 matching lines @@
     has_su = bool(mode)
 
     available_governors = KNOWN_CPU_SCALING_GOVERNOR_VALUES
     out = device.PullContent(
         '/sys/devices/system/cpu/cpu0/cpufreq/scaling_available_governors')
     if out:
       available_governors = sorted(i for i in out.split())
       assert set(available_governors).issubset(
           KNOWN_CPU_SCALING_GOVERNOR_VALUES), available_governors
 
-    cpuinfo_max_freq = device.PullContent(
-        '/sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq')
-    if cpuinfo_max_freq:
-      cpuinfo_max_freq = int(cpuinfo_max_freq)
-    cpuinfo_min_freq = device.PullContent(
-        '/sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_min_freq')
-    if cpuinfo_min_freq:
-      cpuinfo_min_freq = int(cpuinfo_min_freq)
+    available_frequencies = device.PullContent(
+        '/sys/devices/system/cpu/cpu0/cpufreq/scaling_available_frequencies')
+    if available_frequencies:
+      available_frequencies = sorted(
+          int(i) for i in available_frequencies.strip().split())
+    else:
+      # It's possibly an older kernel. In that case, query the min/max instead.
+      cpuinfo_min_freq = device.PullContent(
+          '/sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_min_freq')
+      cpuinfo_max_freq = device.PullContent(
+          '/sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq')
+      if cpuinfo_min_freq and cpuinfo_max_freq:
+        # In practice there's more CPU speeds than this but there's no way (?)
+        # to query this information.
+        available_frequencies = [int(cpuinfo_min_freq), int(cpuinfo_max_freq)]
 
     cache = DeviceCache(
-        properties, external_storage_path, has_su, available_governors,
-        cpuinfo_max_freq, cpuinfo_min_freq)
+        properties, external_storage_path, has_su,
+        available_frequencies, available_governors)
     # Only save the cache if all the calls above worked.
     if all(i is not None for i in cache._asdict().itervalues()):
       _PER_DEVICE_CACHE.set(device, cache)
   return cache
 
 
 ### Public API.
 
 
 # List of known CPU scaling governor values.
@@ skipping 11 matching lines @@
 # initialized and that cannot change without formatting the device.
 DeviceCache = collections.namedtuple(
     'DeviceCache',
     [
         # Cache of /system/build.prop on the Android device.
         'build_props',
         # Cache of $EXTERNAL_STORAGE_PATH.
         'external_storage_path',
         # /system/xbin/su exists.
         'has_su',
-        # All the valid CPU scaling governors.
+        # Valid CPU frequencies.
+        'available_frequencies',
+        # Valid CPU scaling governors.
         'available_governors',
-        # CPU frequency limits.
-        'cpuinfo_max_freq',
-        'cpuinfo_min_freq',
     ])
 
 
 def Initialize(pub_key, priv_key):
   """Initialize Android support through adb.
 
   You can steal pub_key, priv_key pair from ~/.android/adbkey and
   ~/.android/adbkey.pub.
   """
   with _ADB_KEYS_LOCK:
@@ skipping 178 matching lines @@
 
   # High level methods.
 
   def GetCPUScale(self):
     """Returns the CPU scaling factor."""
     mapping = {
         'scaling_cur_freq': u'cur',
         'scaling_governor': u'governor',
     }
     out = {
-        'max': self.cache.cpuinfo_max_freq,
-        'min': self.cache.cpuinfo_min_freq,
+        v: self.PullContent('/sys/devices/system/cpu/cpu0/cpufreq/' + k)
+        for k, v in mapping.iteritems()
     }
-    out.update(
-        (v, self.PullContent('/sys/devices/system/cpu/cpu0/cpufreq/' + k))
-        for k, v in mapping.iteritems())
     return {
         k: v.strip() if isinstance(v, str) else v for k, v in out.iteritems()
     }
 
   def SetCPUScalingGovernor(self, governor):
     """Sets the CPU scaling governor to the one specified.
 
     Returns:
       True on success.
     """
     assert governor in KNOWN_CPU_SCALING_GOVERNOR_VALUES, repr(governor)
+    if not self.cache.available_governors:
+      return False
     if governor not in self.cache.available_governors:
       if governor == 'powersave':
-        return self.SetCPUSpeed(self.cache.cpuinfo_min_freq)
+        return self.SetCPUSpeed(self.cache.available_frequencies[0])
       if governor == 'ondemand':
         governor = 'interactive'
       elif governor == 'interactive':
         governor = 'ondemand'
       else:
         _LOG.warning(
             '%s.SetCPUScalingGovernor(): Can\'t switch to %s',
             self.port_path, governor)
         return False
     assert governor in KNOWN_CPU_SCALING_GOVERNOR_VALUES, governor
@@ skipping 36 matching lines @@
     return True
 
   def SetCPUSpeed(self, speed):
     """Enforces strict CPU speed and disable the CPU scaling governor.
 
     Returns:
       True on success.
     """
     assert isinstance(speed, int), speed
     assert 10000 <= speed <= 10000000, speed
+    if not self.cache.available_frequencies:
+      return False
+    assert speed in self.cache.available_frequencies, (
+        speed, self.cache.available_frequencies)
     success = self.SetCPUScalingGovernor('userspace')
     if not self.PushContent(
         '%d\n' % speed,
         '/sys/devices/system/cpu/cpu0/cpufreq/scaling_setspeed'):
       return False
     # Get it back to confirm.
     val = self.PullContent(
         '/sys/devices/system/cpu/cpu0/cpufreq/scaling_setspeed')
     return success and (val or '').strip() == str(speed)
 
@@ skipping 307 matching lines @@
     return out
 
   @classmethod
   def _Connect(cls, constructor, **kwargs):
     """Called by either ConnectDevice or Connect."""
     if not kwargs.get('rsa_keys'):
       with _ADB_KEYS_LOCK:
         kwargs['rsa_keys'] = _ADB_KEYS[:]
     device = constructor(**kwargs)
     return HighDevice(device, _InitCache(device))