enb · blond · Aug 16, 2016 · Aug 15, 2016
diff --git a/lib/api/make.js b/lib/api/make.js
@@ -73,9 +73,12 @@ module.exports = function (targets, options) {
                         .then(function () {
                             if (options.profiler) {
                                 var profiler = makePlatform.getBuildProfiler();
+                                var buildTimes = profiler.calculateBuildTimes(makePlatform.getBuildGraph());
+                                var techMetricsData = profiler.calculateTechMetrics(buildTimes);
 
                                 return {
-                                    buildTimes: profiler.calculateBuildTimes(makePlatform.getBuildGraph())
+                                    buildTimes: buildTimes,
+                                    techMetrics: techMetricsData
                                 };
                             }
 

diff --git a/lib/build-profiler.js b/lib/build-profiler.js
@@ -3,7 +3,8 @@
  * ======
  */
 var inherit = require('inherit'),
-    _ = require('lodash');
+    _ = require('lodash'),
+    percentile = require('percentile');
 
 /**
  * BuildProfiler
@@ -28,11 +29,13 @@ module.exports = inherit(/** @lends BuildProfiler.prototype */ {
      * Устанавливает время начала работы для указанного таргета.
      * Если время не указано, то будет записано текущее.
      * @param {String} targetName
+     * @param {String} techName
      * @param {Number} [time]
      */
-    setStartTime: function (targetName, time) {
+    setStartTime: function (targetName, techName, time) {
         var targetTimes = this._buildTimes[targetName] || (this._buildTimes[targetName] = {});
 
+        targetTimes.techName = techName;
         targetTimes.startTime = time || Date.now();
     },
 
@@ -80,6 +83,8 @@ module.exports = inherit(/** @lends BuildProfiler.prototype */ {
             if (depStartTime > targetStartTime) {
                 var timBefore = (depStartTime - targetStartTime);
                 selfTime += timBefore;
+            } else if (depEndTime < targetStartTime) {
+                selfTime = targetEndTime - targetStartTime;
             }
         } else {
             selfTime = targetEndTime - targetStartTime;
@@ -96,6 +101,20 @@ module.exports = inherit(/** @lends BuildProfiler.prototype */ {
         this._buildTimes[targetName] = _.assign(this._buildTimes[targetName], benchmarkObj);
     },
 
+    /**
+     * @param {Object} obj
+     * @param {Function} mapper
+     * @param {String} sortKey
+     * @returns {Array}
+     */
+    objectToSortedArray: function (obj, mapper, sortKey) {
+        return _(obj)
+            .map(mapper)
+            .compact()
+            .value()
+            .sort(function (a, b) { return b[sortKey] - a[sortKey]; });
+    },
+
     /**
      * Вычисляет время выполнения каждого таргета.
      * @param {BuildGraph} graph
@@ -109,6 +128,63 @@ module.exports = inherit(/** @lends BuildProfiler.prototype */ {
             _this._calculateTargetBuildTime(targetName, deps);
         });
 
-        return this._buildTimes;
+        return this.objectToSortedArray(
+                this._buildTimes,
+                function (targetBuildInfo, target) {
+                    return _.assign({ target: target }, targetBuildInfo);
+                },
+                'selfTime'
+            );
+    },
+
+    /**
+     * @param {Number} buildTime
+     * @param {Number} totalTime
+     * @return {Number}
+     */
+    getBuildTimePercent: function (buildTime, totalTime) {
+        return buildTime > 0
+            ? parseFloat(buildTime / totalTime * 100, 2).toFixed(2)
+            : 0;
+    },
+
+    /**
+     * @param {Object} buildTimes
+     * @returns {Array}
+     */
+    calculateTechMetrics: function (buildTimes) {
+        var metricsByTech = {};
+        var totalTime = 0;
+        var _this = this;
+
+        _.map(buildTimes, function (benchmark, target) {
+            var tech = benchmark && benchmark.techName;
+            var selfTime = buildTimes[target].selfTime;
+
+            if (!tech) { return; }
+
+            var techMetrics = metricsByTech[tech] || { callNumber: 0, buildTime: 0, buildTimes: [] };
+
+            techMetrics.callNumber++;
+            techMetrics.buildTime += selfTime;
+            techMetrics.buildTimes.push(selfTime);
+            totalTime += selfTime;
+
+            metricsByTech[tech] = techMetrics;
+        });
+
+        return this.objectToSortedArray(
+                metricsByTech,
+                function (metrics, tech) {
+                    return {
+                        tech: tech,
+                        callNumber: metrics.callNumber,
+                        buildTime: metrics.buildTime,
+                        percentile95: percentile(95, metrics.buildTimes),
+                        buildTimePercent: _this.getBuildTimePercent(metrics.buildTime, totalTime)
+                    };
+                },
+                'buildTime'
+            );
     }
 });
diff --git a/lib/cli/make.js b/lib/cli/make.js
@@ -5,6 +5,7 @@
  * Этот файл запускает сборку из командной строки.
  */
 var make = require('../api').make;
+var profilerUI = require('../ui/profiler-ui');
 var deprecate = require('../utils/deprecate');
 
 module.exports = function (program) {
@@ -14,7 +15,7 @@ module.exports = function (program) {
         .option('-d, --dir <dir>', 'custom project root')
         .option('-H, --hide-warnings', 'hides warnings')
         .option('--graph', 'draws build graph')
-        .option('--profiler', 'log build time of targets')
+        .option('--profiler [type]', 'log build time of targets')
         .description('build specified targets')
         .action(function () {
             var args = program.args.slice(0);
@@ -23,6 +24,15 @@ module.exports = function (program) {
             deprecate.initialize({ hideWarnings: cmd ? cmd.hideWarnings : false });
 
             make(args, cmd)
+                .then(function (data) {
+                    if (cmd.profiler) {
+                        if (cmd.profiler === 'targets') {
+                            profilerUI.printTargetTable(data.buildTimes);
+                        } else {
+                            profilerUI.printTechTable(data.techMetrics);
+                        }
+                    }
+                })
                 .fail(function (err) {
                     console.error(err.stack);
                     process.exit(1);

diff --git a/lib/make.js b/lib/make.js
@@ -130,16 +130,16 @@ module.exports = inherit(/** @lends MakePlatform.prototype */ {
     /**
      * Возвращает профайлер для указанной ноды
      * @param {String} nodeName
-     * @returns {{setStartTime: function, setEndTime: function}}
+     * @returns {?{setStartTime: function, setEndTime: function}}
      */
     getNodeProfiler: function (nodeName) {
         var profiler = this._profiler;
 
         return {
-            setStartTime: function (target) {
+            setStartTime: function (target, techName) {
                 var filename = path.join(nodeName, target);
 
-                return profiler.setStartTime(filename);
+                return profiler.setStartTime(filename, techName);
             },
             setEndTime: function (target) {
                 var filename = path.join(nodeName, target);
@@ -371,7 +371,8 @@ module.exports = inherit(/** @lends MakePlatform.prototype */ {
                 nodeConfig = this._projectConfig.getNodeConfig(nodePath),
                 node = nodeFactory.mkNode(nodePath, this, this._cache, this._graph);
 
-            node.setProfiler(this.getNodeProfiler(nodePath));
+            if (this._profiler) node.setProfiler(this.getNodeProfiler(nodePath));
+
             node.setLogger(this._logger.subLogger(nodePath));
             this._nodes[nodePath] = node;
             this._nodeInitPromises[nodePath] = vowFs.makeDir(path.join(cdir, nodePath))

diff --git a/lib/node/node.js b/lib/node/node.js
@@ -504,7 +504,7 @@ module.exports = inherit(/** @lends Node.prototype */ {
             }
             if (!targetObj.started) {
                 if (_this._profiler) {
-                    _this._profiler.setStartTime(source);
+                    _this._profiler.setStartTime(source, targetObj.tech.getName());
                 }
 
                 targetObj.started = true;

diff --git a/lib/ui/profiler-ui.js b/lib/ui/profiler-ui.js
@@ -0,0 +1,39 @@
+var _ = require('lodash');
+var prettyMs = require('pretty-ms');
+var Table = require('cli-table');
+
+module.exports = {
+    printTechTable: function (printData) {
+        var printTable = new Table({
+            head: ['Tech', 'Number of calls', 'Time spend (%)', 'Percentile 95']
+        });
+
+        _.map(printData, function (techInfo) {
+            printTable.push([
+                techInfo.tech,
+                techInfo.callNumber,
+                techInfo.buildTimePercent,
+                prettyMs(techInfo.percentile95)
+            ]);
+        });
+
+        console.log(printTable.toString());
+    },
+
+    printTargetTable: function (printData) {
+        var printTable = new Table({
+            head: ['Target', 'Self time', 'Wating time', 'Total time']
+        });
+
+        _.map(printData, function (targetInfo) {
+            printTable.push([
+                targetInfo.target,
+                prettyMs(targetInfo.selfTime),
+                prettyMs(targetInfo.watingTime),
+                prettyMs(targetInfo.totalTime)
+            ]);
+        });
+
+        console.log(printTable.toString());
+    }
+};
diff --git a/package.json b/package.json
@@ -45,14 +45,17 @@
   "dependencies": {
     "chalk": "1.1.3",
     "clear-require": "1.0.1",
+    "cli-table": "0.3.1",
     "commander": "2.9.0",
     "connect": "3.4.1",
     "enb-async-require": "1.0.1",
     "enb-require-or-eval": "1.0.2",
     "enb-source-map": "1.9.0",
     "glob": "7.0.5",
-    "inherit": "2.2.5",
-    "lodash": "4.15.0",
+    "inherit": "2.2.4",
+    "lodash": "4.13.1",
+    "percentile": "1.1.0",
+    "pretty-ms": "2.1.0",
     "puml-link": "0.0.1",
     "resolve": "1.1.7",
     "serve-favicon": "2.3.0",

diff --git a/test/lib/build-profiler.js b/test/lib/build-profiler.js
@@ -22,24 +22,24 @@ describe('BuildProfiler', function () {
         });
 
         it('should set target with specified start time', function () {
-            var expected = { 'some-bundle/some-target': { startTime: 100500 } };
+            var expected = { 'some-bundle/some-target': { startTime: 100500, techName: 'tech' } };
 
-            profiler.setStartTime('some-bundle/some-target', 100500);
+            profiler.setStartTime('some-bundle/some-target', 'tech', 100500);
 
             expect(buildTimes).to.be.deep.equal(expected);
         });
 
         it('should reset target with specified start time', function () {
-            var expected = { 'some-bundle/some-target': { startTime: 100501 } };
+            var expected = { 'some-bundle/some-target': { startTime: 100501, techName: 'tech' } };
 
-            profiler.setStartTime('some-bundle/some-target', 100500);
-            profiler.setStartTime('some-bundle/some-target', 100501);
+            profiler.setStartTime('some-bundle/some-target', 'tech', 100500);
+            profiler.setStartTime('some-bundle/some-target', 'tech', 100501);
 
             expect(buildTimes).to.be.deep.equal(expected);
         });
 
         it('should set current time (Date.now())', function () {
-            var expected = { 'some-bundle/some-target': { startTime: 0 } };
+            var expected = { 'some-bundle/some-target': { startTime: 0, techName: undefined } };
 
             profiler.setStartTime('some-bundle/some-target');
 
@@ -62,9 +62,9 @@ describe('BuildProfiler', function () {
         });
 
         it('should set specified end time', function () {
-            var expected = { 'some-bundle/some-target': { startTime: 100500, endTime: 100501 } };
+            var expected = { 'some-bundle/some-target': { startTime: 100500, endTime: 100501, techName: 'tech' } };
 
-            profiler.setStartTime('some-bundle/some-target', 100500); // need to initialize benchmark object
+            profiler.setStartTime('some-bundle/some-target', 'tech', 100500); // need to initialize benchmark object
             profiler.setEndTime('some-bundle/some-target', 100501);
 
             expect(buildTimes).to.be.deep.equal(expected);
@@ -186,6 +186,41 @@ describe('BuildProfiler', function () {
             expect(buildTimes).to.be.deep.equal(expected);
         });
 
+        it('should calculate time for each target if deps end before target run', function () {
+            buildTimes = {
+                'some-bundle/some-target': {
+                    startTime: 100500,
+                    endTime: 100505
+                },
+                'another-bundle/another-target': {
+                    startTime: 100506,
+                    endTime: 100510
+                }
+            };
+            profiler = new BuildProfiler(buildTimes);
+
+            var expected = {
+                'some-bundle/some-target': {
+                    startTime: 100500,
+                    endTime: 100505,
+                    selfTime: 5,
+                    totalTime: 5,
+                    watingTime: 0
+                },
+                'another-bundle/another-target': {
+                    startTime: 100506,
+                    endTime: 100510,
+                    selfTime:4,
+                    totalTime: 4,
+                    watingTime: 0
+                }
+            };
+
+            profiler.calculateBuildTimes(buildGraph(graph));
+
+            expect(buildTimes).to.be.deep.equal(expected);
+        });
+
         it('should calculate time for each target which are independent of each other', function () {
             graph = {
                 'some-bundle/parallel-target-1': { deps: [] },