Output units with histogram results.

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 sys
 
 import android_commands
 import json
 import logging
@@ skipping 110 matching lines @@
         '= ' if trace_name else '',
         value,
         units)
   else:
     assert(result_type in ['histogram', 'unimportant-histogram'])
     assert isinstance(values, list)
     # The histograms can only be printed individually, there's no computation
     # across different histograms.
     assert len(values) == 1
     value = values[0]
-    output = '%s%s: %s= %s' % (
+    output = '%s%s: %s= %s %s' % (
         RESULT_TYPES[result_type],
         _EscapePerfResult(measurement),
         trace_name,
-        value)
+        value,
+        units)
     avg, sd = GeomMeanAndStdDevFromHistogram(value)
 
   if avg:
     output += '\nAvg %s: %f%s' % (measurement, avg, units)
   if sd:
     output += '\nSd  %s: %f%s' % (measurement, sd, units)
   if print_to_stdout:
     print output
     sys.stdout.flush()
   return output
@@ skipping 47 matching lines @@
     """Resets the original performance mode of the device."""
     self._SetScalingGovernorInternal(self._original_scaling_governor)
 
   def _SetScalingGovernorInternal(self, value):
     for cpu in range(self._kernel_max + 1):
       scaling_governor_file = PerfControl._SCALING_GOVERNOR_FMT % cpu
       if self._adb.FileExistsOnDevice(scaling_governor_file):
         logging.info('Writing scaling governor mode \'%s\' -> %s' %
                      (value, scaling_governor_file))
         self._adb.SetProtectedFileContents(scaling_governor_file, value)