feat(bench press): allow multiple reporters, metrics and driver extensions.

Author: tbosch

modules/benchpress/benchpress.js

@@ -14,5 +14,7 @@ export { IOsDriverExtension } from './src/webdriver/ios_driver_extension';
 export { Runner } from './src/runner';
 export { Options } from './src/sample_options';
 export { MeasureValues } from './src/measure_values';
+export { MultiMetric } from './src/metric/multi_metric';
+export { MultiReporter } from './src/reporter/multi_reporter';
 
 export { bind, Injector, OpaqueToken } from 'angular2/di';

modules/benchpress/src/metric.js

@@ -1,3 +1,4 @@
+import { bind } from 'angular2/di';
 import {
  Promise, PromiseWrapper
 } from 'angular2/src/facade/async';
@@ -11,6 +12,14 @@ import { StringMap } from 'angular2/src/facade/collection';
  */
 @ABSTRACT()
 export class Metric {
+ static bindTo(delegateToken) {
+ return [
+ bind(Metric).toFactory(
+ (delegate) => delegate, [delegateToken]
+ )
+ ];
+ }
+
  /**
  * Starts measuring
  */

modules/benchpress/src/metric/multi_metric.js

@@ -0,0 +1,69 @@
+import { bind, Injector, OpaqueToken } from 'angular2/di';
+import { List, ListWrapper, StringMapWrapper, StringMap } from 'angular2/src/facade/collection';
+import { Promise, PromiseWrapper } from 'angular2/src/facade/async';
+
+import { Metric } from '../metric';
+
+export class MultiMetric extends Metric {
+ static createBindings(childTokens) {
+ return [
+ bind(_CHILDREN).toAsyncFactory(
+ (injector) => PromiseWrapper.all(ListWrapper.map(childTokens, (token) => injector.asyncGet(token) )),
+ [Injector]
+ ),
+ bind(MultiMetric).toFactory(
+ (children) => new MultiMetric(children),
+ [_CHILDREN]
+ )
+ ];
+ }
+
+ _metrics:List;
+
+ constructor(metrics) {
+ super();
+ this._metrics = metrics;
+ }
+
+ /**
+ * Starts measuring
+ */
+ beginMeasure():Promise {
+ return PromiseWrapper.all(ListWrapper.map(
+ this._metrics, (metric) => metric.beginMeasure()
+ ));
+ }
+
+ /**
+ * Ends measuring and reports the data
+ * since the begin call.
+ * @param restart: Whether to restart right after this.
+ */
+ endMeasure(restart:boolean):Promise<StringMap> {
+ return PromiseWrapper.all(ListWrapper.map(
+ this._metrics, (metric) => metric.endMeasure(restart)
+ )).then( (values) => {
+ return mergeStringMaps(values);
+ });
+ }
+
+ /**
+ * Describes the metrics provided by this metric implementation.
+ * (e.g. units, ...)
+ */
+ describe():StringMap {
+ return mergeStringMaps(this._metrics.map( (metric) => metric.describe() ));
+ }
+}
+
+function mergeStringMaps(maps) {
+ var result = {};
+ ListWrapper.forEach(maps, (map) => {
+ StringMapWrapper.forEach(map, (value, prop) => {
+ result[prop] = value;
+ });
+ });
+ return result;
+}
+
+var _CHILDREN = new OpaqueToken('MultiMetric.children');

modules/benchpress/src/metric/perflog_metric.js

@@ -155,7 +155,7 @@ var _MAX_RETRY_COUNT = 20;
 var _MARK_NAME_PREFIX = 'benchpress';
 var _SET_TIMEOUT = new OpaqueToken('PerflogMetric.setTimeout');
 var _BINDINGS = [
- bind(Metric).toFactory(
+ bind(PerflogMetric).toFactory(
  (driverExtension, setTimeout) => new PerflogMetric(driverExtension, setTimeout),
  [WebDriverExtension, _SET_TIMEOUT]
  ),

modules/benchpress/src/reporter.js

@@ -1,3 +1,4 @@
+import { bind } from 'angular2/di';
 import {
  Promise, PromiseWrapper
 } from 'angular2/src/facade/async';
@@ -12,6 +13,14 @@ import { MeasureValues } from './measure_values';
  */
 @ABSTRACT()
 export class Reporter {
+ static bindTo(delegateToken) {
+ return [
+ bind(Reporter).toFactory(
+ (delegate) => delegate, [delegateToken]
+ )
+ ];
+ }
+
  reportMeasureValues(values:MeasureValues):Promise {
  throw new BaseException('NYI');
  }

modules/benchpress/src/reporter/console_reporter.js

@@ -109,7 +109,7 @@ export class ConsoleReporter extends Reporter {
 var _PRINT = new OpaqueToken('ConsoleReporter.print');
 var _COLUMN_WIDTH = new OpaqueToken('ConsoleReporter.columnWidht');
 var _BINDINGS = [
- bind(Reporter).toFactory(
+ bind(ConsoleReporter).toFactory(
  (columnWidth, sampleDescription, print) => new ConsoleReporter(columnWidth, sampleDescription, print),
  [_COLUMN_WIDTH, SampleDescription, _PRINT]
  ),

modules/benchpress/src/reporter/multi_reporter.js

@@ -0,0 +1,42 @@
+import { bind, Injector, OpaqueToken } from 'angular2/di';
+import { List, ListWrapper } from 'angular2/src/facade/collection';
+import { Promise, PromiseWrapper } from 'angular2/src/facade/async';
+
+import { MeasureValues } from '../measure_values';
+import { Reporter } from '../reporter';
+
+export class MultiReporter extends Reporter {
+ static createBindings(childTokens) {
+ return [
+ bind(_CHILDREN).toAsyncFactory(
+ (injector) => PromiseWrapper.all(ListWrapper.map(childTokens, (token) => injector.asyncGet(token) )),
+ [Injector]
+ ),
+ bind(MultiReporter).toFactory(
+ (children) => new MultiReporter(children),
+ [_CHILDREN]
+ )
+ ];
+ }
+
+ _reporters:List;
+
+ constructor(reporters) {
+ super();
+ this._reporters = reporters;
+ }
+
+ reportMeasureValues(values:MeasureValues):Promise {
+ return PromiseWrapper.all(ListWrapper.map(
+ this._reporters, (reporter) => reporter.reportMeasureValues(values)
+ ));
+ }
+
+ reportSample(completeSample:List<MeasureValues>, validSample:List<MeasureValues>):Promise {
+ return PromiseWrapper.all(ListWrapper.map(
+ this._reporters, (reporter) => reporter.reportSample(completeSample, validSample)
+ ));
+ }
+}
+
+var _CHILDREN = new OpaqueToken('MultiReporter.children');

modules/benchpress/src/runner.js

@@ -5,11 +5,19 @@ import { Promise } from 'angular2/src/facade/async';
 
 import { Sampler, SampleState } from './sampler';
 import { ConsoleReporter } from './reporter/console_reporter';
+import { MultiReporter } from './reporter/multi_reporter';
 import { RegressionSlopeValidator } from './validator/regression_slope_validator';
+import { SizeValidator } from './validator/size_validator';
+import { Validator } from './validator';
 import { PerflogMetric } from './metric/perflog_metric';
+import { MultiMetric } from './metric/multi_metric';
 import { ChromeDriverExtension } from './webdriver/chrome_driver_extension';
+import { IOsDriverExtension } from './webdriver/ios_driver_extension';
+import { WebDriverExtension } from './web_driver_extension';
 import { SampleDescription } from './sample_description';
-
+import { WebDriverAdapter } from './web_driver_adapter';
+import { Reporter } from './reporter';
+import { Metric } from './metric';
 import { Options } from './sample_options';
 
 /**
@@ -48,7 +56,23 @@ var _DEFAULT_BINDINGS = [
  Sampler.BINDINGS,
  ConsoleReporter.BINDINGS,
  RegressionSlopeValidator.BINDINGS,
+ SizeValidator.BINDINGS,
  ChromeDriverExtension.BINDINGS,
+ IOsDriverExtension.BINDINGS,
  PerflogMetric.BINDINGS,
- SampleDescription.BINDINGS
+ SampleDescription.BINDINGS,
+ MultiReporter.createBindings([ConsoleReporter]),
+ MultiMetric.createBindings([PerflogMetric]),
+
+ Reporter.bindTo(MultiReporter),
+ Validator.bindTo(RegressionSlopeValidator),
+ WebDriverExtension.bindTo([ChromeDriverExtension, IOsDriverExtension]),
+ Metric.bindTo(MultiMetric),
+
+ bind(Options.CAPABILITIES).toAsyncFactory(
+ (adapter) => adapter.capabilities(), [WebDriverAdapter]
+ ),
+ bind(Options.USER_AGENT).toAsyncFactory(
+ (adapter) => adapter.executeScript('return window.navigator.userAgent;'), [WebDriverAdapter]
+ )
 ];

modules/benchpress/src/sample_description.js

@@ -27,15 +27,18 @@ export class SampleDescription {
 
 var _BINDINGS = [
  bind(SampleDescription).toFactory(
- (metric, id, forceGc, validator, defaultDesc, userDesc) => new SampleDescription(id,
+ (metric, id, forceGc, userAgent, validator, defaultDesc, userDesc) => new SampleDescription(id,
  [
- {'forceGc': forceGc},
+ {'forceGc': forceGc, 'userAgent': userAgent},
  validator.describe(),
  defaultDesc,
  userDesc
  ],
  metric.describe()),
- [Metric, Options.SAMPLE_ID, Options.FORCE_GC, Validator, Options.DEFAULT_DESCRIPTION, Options.SAMPLE_DESCRIPTION]
+ [
+ Metric, Options.SAMPLE_ID, Options.FORCE_GC, Options.USER_AGENT,
+ Validator, Options.DEFAULT_DESCRIPTION, Options.SAMPLE_DESCRIPTION
+ ]
  ),
  bind(Options.DEFAULT_DESCRIPTION).toValue({}),
  bind(Options.SAMPLE_DESCRIPTION).toValue({})

modules/benchpress/src/sample_options.js

@@ -13,11 +13,17 @@ export class Options {
  static get PREPARE() { return _PREPARE; }
  // TODO(tbosch): use static initializer when our transpiler supports it
  static get EXECUTE() { return _EXECUTE; }
+ // TODO(tbosch): use static initializer when our transpiler supports it
+ static get CAPABILITIES() { return _CAPABILITIES; }
+ // TODO(tbosch): use static initializer when our transpiler supports it
+ static get USER_AGENT() { return _USER_AGENT; }
 }
 
-var _SAMPLE_ID = new OpaqueToken('SampleDescription.sampleId');
-var _DEFAULT_DESCRIPTION = new OpaqueToken('SampleDescription.defaultDescription');
-var _SAMPLE_DESCRIPTION = new OpaqueToken('SampleDescription.sampleDescription');
-var _FORCE_GC = new OpaqueToken('Sampler.forceGc');
-var _PREPARE = new OpaqueToken('Sampler.prepare');
-var _EXECUTE = new OpaqueToken('Sampler.execute');
+var _SAMPLE_ID = new OpaqueToken('Options.sampleId');
+var _DEFAULT_DESCRIPTION = new OpaqueToken('Options.defaultDescription');
+var _SAMPLE_DESCRIPTION = new OpaqueToken('Options.sampleDescription');
+var _FORCE_GC = new OpaqueToken('Options.forceGc');
+var _PREPARE = new OpaqueToken('Options.prepare');
+var _EXECUTE = new OpaqueToken('Options.execute');
+var _CAPABILITIES = new OpaqueToken('Options.capabilities');
+var _USER_AGENT = new OpaqueToken('Options.userAgent');