Android / Telemetry: make surface_stats_collector more robust.

build/android/surface_stats.py

 #!/usr/bin/env python
 #
 # Copyright (c) 2013 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.
 
 """Command line tool for continuously printing Android graphics surface
 statistics on the console.
 """
 
@@ skipping 11 matching lines @@
   'max_frame_delay (vsyncs)': '%d',
   'avg_surface_fps (fps)': '%.2f',
   'frame_lengths (vsyncs)': '%.3f',
   'refresh_period (seconds)': '%.6f',
 }
 
 
 def _MergeResults(results, fields):
   merged_results = collections.defaultdict(list)
   for result in results:
-    if fields != ['all'] and not result.name in fields:
+    if ((fields != ['all'] and not result.name in fields) or
+        result.value is None):

[marja, 2013/06/06 13:03:32]

-> "or not result.value"

[Sami, 2013/06/06 13:10:03]

See above; 0 is a valid result.value but None isn't :)

[marja, 2013/06/06 13:31:44]

Ah, alright :)

       continue
     name = '%s (%s)' % (result.name, result.unit)
     if isinstance(result.value, list):
       value = result.value
     else:
       value = [result.value]
     merged_results[name] += value
   for name, values in merged_results.iteritems():
     merged_results[name] = sum(values) / float(len(values))
   return merged_results
@@ skipping 79 matching lines @@
       _PrintResults(results)
       row_count += 1
   except KeyboardInterrupt:
     sys.exit(0)
   finally:
     collector.Stop()
 
 
 if __name__ == '__main__':
   main(sys.argv)