mojo_benchmark: improve recording the chart data for perf dashboard.

mojo/devtools/common/mojo_benchmark

 #!/usr/bin/env python
 # Copyright 2015 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.
 
 """Runner for Mojo application benchmarks."""
 
 import argparse
 import logging
 import sys
 import time
 import os.path
 import re
 
 from devtoolslib import shell_arguments
 from devtoolslib import shell_config
-from devtoolslib import performance_dashboard
+from devtoolslib import perf_dashboard
 
 
 _DESCRIPTION = """Runner for Mojo application benchmarks.
 
 |benchmark_list_file| has to be a valid Python program that sets a |benchmarks|
 global variable, containing entries of the following form:
 
   {
     'name': '<name of the benchmark>',
     'app': '<url of the app to benchmark>',
@@ skipping 160 matching lines @@
   try:
     shell, common_shell_args = shell_arguments.get_shell(config, [])
   except shell_arguments.ShellConfigurationException as e:
     print e
     return 1
 
   target_os = 'android' if script_args.android else 'linux'
   benchmark_list_params = {"target_os": target_os}
   exec script_args.benchmark_list_file in benchmark_list_params
 
-  chart_data_recorder = None
-  if script_args.chart_data_output_file:
-    chart_data_recorder = performance_dashboard.ChartDataRecorder()
-
   exit_code = 0
   for benchmark_spec in benchmark_list_params['benchmarks']:
     for variant_spec in _generate_benchmark_variants(benchmark_spec):
       name = variant_spec['name']
       app = variant_spec['app']
       duration = variant_spec['duration']
       shell_args = variant_spec.get('shell-args', []) + common_shell_args
       measurements = variant_spec['measurements']
+
+      chart_data_recorder = None
+      if script_args.chart_data_output_file:
+        chart_data_recorder = perf_dashboard.ChartDataRecorder(name)
       benchmark_succeeded, benchmark_error, output = _run_benchmark(
           shell, shell_args, name, app, duration, measurements,
           script_args.verbose, script_args.android,
           script_args.save_traces)
 
       print '[ %s ]' % name
 
       some_measurements_failed = False
       if benchmark_succeeded:
         measurement_results = _parse_measurement_results(output)
@@ skipping 16 matching lines @@
         if not benchmark_succeeded:
           print 'benchmark failed: ' + benchmark_error
         if some_measurements_failed:
           print 'some measurements failed'
         print 'output: '
         print '-' * 72
         print output
         print '-' * 72
         exit_code = 1
 
-  if script_args.chart_data_output_file:
-    script_args.chart_data_output_file.write(chart_data_recorder.get_json())
+      if script_args.chart_data_output_file:
+        script_args.chart_data_output_file.write(chart_data_recorder.get_json())

[etiennej, 2015/10/23 10:02:12]

Do you want to add a newline at the end of the json string?

[ppi, 2015/10/23 10:59:12]

Done.

 
   return exit_code
 
 if __name__ == '__main__':
   sys.exit(main())