Android pylib: measurement name escaping fix.

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
 
 # Valid values of result type.
 RESULT_TYPES = {'unimportant': 'RESULT ',
                 'default': '*RESULT ',
                 'informational': '',
                 'unimportant-histogram': 'HISTOGRAM ',
                 'histogram': '*HISTOGRAM '}
 
 
 def _EscapePerfResult(s):
   """Escapes |s| for use in a perf result."""
-  # Colons (:) and equal signs (=) are not allowed.
-  return re.sub(':|=', '_', s)
+  # Colons (:), equal signs (=) and slashes (/) are not allowed.
+  return re.sub('[\:|=/]', '_', s)

[bulach, 2012/12/14 14:23:34]

nit: would this work?
r'[:=/]'

[marja, 2012/12/14 16:17:13]

Yeah, but imo it's not any clearer than this version (to understand it, you need
to know that "aha, : is a special character inside [] *unless* it's in the
beginning"), and it's more error prone in case somebody feels like adding other
characters to the beginning instead of the end... -> left this like it was.

 
 
 def GeomMeanAndStdDevFromHistogram(histogram_json):
   histogram = json.loads(histogram_json)
   count = 0
   sum_of_logs = 0
   for bucket in histogram['buckets']:
     if 'high' in bucket:
       bucket['mean'] = (bucket['low'] + bucket['high']) / 2.0
     else:
@@ skipping 123 matching lines @@
   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))