[telemetry] Adding --output-format option to enable more user-friendly output.

tools/telemetry/telemetry/multi_page_benchmark.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.
 from collections import defaultdict
 import os
 import sys
 
 from telemetry import page_test
 
 # Get build/android/pylib scripts into our path.
@@ skipping 68 matching lines @@
         self.results_summary.iteritems()):
       measurement, units, data_type = measurement_units_type
       if '.' in measurement:
         measurement, trace = measurement.split('.', 1)
         trace += (trace_tag or '')
       else:
         trace = measurement + (trace_tag or '')
       PrintPerfResult(measurement, trace, values, units, data_type)
 
 
-class CsvBenchmarkResults(BenchmarkResults):
-  def __init__(self, results_writer):
-    super(CsvBenchmarkResults, self).__init__()
-    self._results_writer = results_writer
-    self._did_write_header = False
+class IncrementalBenchmarkResults(BenchmarkResults):
+  def __init__(self):
+    super(IncrementalBenchmarkResults, self).__init__()
+    self._did_process_header = False
 
   def DidMeasurePage(self):
-    super(CsvBenchmarkResults, self).DidMeasurePage()
+    super(IncrementalBenchmarkResults, self).DidMeasurePage()
 
-    if not self._did_write_header:
-      self._did_write_header = True
-      row = ['url']
-      for name in self.field_names:
-        row.append('%s (%s)' % (name, self.field_units[name]))
-      self._results_writer.writerow(row)
+    if not self._did_process_header:
+      self.ProcessHeader()
 
     row = [self._page.url]
     for name in self.field_names:
       value = self._page_values[name]
       if self.field_types[name] == 'histogram':
         avg, _ = GeomMeanAndStdDevFromHistogram(value)
         row.append(avg)
       elif isinstance(value, list):
         row.append(_Mean(value))
       else:
         row.append(value)
+    self.OutputRow(row)
+
+  def OutputRow(self, row):
+    raise NotImplementedError()
+
+  def ProcessHeader(self):
+    raise NotImplementedError()
+
+class CsvBenchmarkResults(IncrementalBenchmarkResults):
+  def __init__(self, results_writer):
+    super(CsvBenchmarkResults, self).__init__()
+    self._results_writer = results_writer
+
+  def OutputRow(self, row):
     self._results_writer.writerow(row)
 
+  def ProcessHeader(self):
+    self._did_process_header = True
+    row = ['url']
+    for name in self.field_names:
+      row.append('%s (%s)' % (name, self.field_units[name]))
+    self.OutputRow(row)
+
+class TerminalBlockBenchmarkResults(IncrementalBenchmarkResults):
+  def __init__(self, output_location):
+    super(TerminalBlockBenchmarkResults, self).__init__()
+    self._output_location = output_location
+    self._header_row = None
+
+  def OutputRow(self, row):
+    for i in range(len(row)):
+      print >> self._output_location, '%s:' % self._header_row[i], row[i]
+    print >> self._output_location
+
+  def ProcessHeader(self):
+    self._did_process_header = True
+    self._header_row = ['url']
+    for name in self.field_names:
+      self._header_row.append('%s (%s)' % (name, self.field_units[name]))
+
 
 # TODO(nduca): Rename to page_benchmark
 class MultiPageBenchmark(page_test.PageTest):
   """Glue code for running a benchmark across a set of pages.
 
   To use this, subclass from the benchmark and override MeasurePage. For
   example:
 
      class BodyChildElementBenchmark(MultiPageBenchmark):
         def MeasurePage(self, page, tab, results):
@@ skipping 42 matching lines @@
 
     Put together:
 
        def MeasurePage(self, page, tab, results):
          res = tab.runtime.Evaluate('2+2')
          if res != 4:
            raise Exception('Oh, wow.')
          results.Add('two_plus_two', 'count', res)
     """
     raise NotImplementedError()