From b7b54271f7ced9068b794fddab246f076849d0ef Mon Sep 17 00:00:00 2001 From: blond Date: Fri, 17 Jun 2016 20:29:28 +0300 Subject: [PATCH 1/2] fix(profiler): use node profiler for node --- lib/make.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/make.js b/lib/make.js index a1d7680c..8fad1bef 100644 --- a/lib/make.js +++ b/lib/make.js @@ -371,7 +371,7 @@ module.exports = inherit(/** @lends MakePlatform.prototype */ { nodeConfig = this._projectConfig.getNodeConfig(nodePath), node = nodeFactory.mkNode(nodePath, this, this._cache, this._graph); - node.setProfiler(this.getBuildProfiler(nodePath)); + node.setProfiler(this.getNodeProfiler(nodePath)); node.setLogger(this._logger.subLogger(nodePath)); this._nodes[nodePath] = node; this._nodeInitPromises[nodePath] = vowFs.makeDir(path.join(cdir, nodePath)) From 592a2cdf016c48f49937d6cb30adce3b9661b4ae Mon Sep 17 00:00:00 2001 From: blond Date: Fri, 17 Jun 2016 20:31:53 +0300 Subject: [PATCH 2/2] refactor(profiler): rename `pureTime` to `selfTime` By analogy with all profilers. --- lib/build-profiler.js | 12 ++++++------ test/lib/build-profiler.js | 16 ++++++++-------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/lib/build-profiler.js b/lib/build-profiler.js index 59704ad1..814195af 100644 --- a/lib/build-profiler.js +++ b/lib/build-profiler.js @@ -54,7 +54,7 @@ module.exports = inherit(/** @lends BuildProfiler.prototype */ { * @param {String[]} deps */ _calculateTargetBuildTime: function (targetName, deps) { - var pureTime = 0; + var selfTime = 0; var targetTimes = this._buildTimes[targetName]; var targetStartTime = targetTimes.startTime; var targetEndTime = targetTimes.endTime; @@ -75,22 +75,22 @@ module.exports = inherit(/** @lends BuildProfiler.prototype */ { // время окончания ожидания зависимостей var depEndTime = Math.max.apply(Math, depsTime.end); - pureTime = targetEndTime - depEndTime; + selfTime = targetEndTime - depEndTime; if (depStartTime > targetStartTime) { var timBefore = (depStartTime - targetStartTime); - pureTime += timBefore; + selfTime += timBefore; } } else { - pureTime = targetEndTime - targetStartTime; + selfTime = targetEndTime - targetStartTime; } var totalTime = targetEndTime - targetStartTime; var benchmarkObj = { totalTime: totalTime, - pureTime: pureTime, - watingTime: totalTime - pureTime + selfTime: selfTime, + watingTime: totalTime - selfTime }; this._buildTimes[targetName] = _.assign(this._buildTimes[targetName], benchmarkObj); diff --git a/test/lib/build-profiler.js b/test/lib/build-profiler.js index 21d101ac..c83518e6 100644 --- a/test/lib/build-profiler.js +++ b/test/lib/build-profiler.js @@ -99,14 +99,14 @@ describe('BuildProfiler', function () { 'some-bundle/some-target': { startTime: 100500, endTime: 100501, - pureTime: 1, + selfTime: 1, totalTime: 1, watingTime: 0 }, 'another-bundle/another-target': { startTime: 100500, endTime: 100503, - pureTime: 2, + selfTime: 2, totalTime: 3, watingTime: 1 } @@ -134,14 +134,14 @@ describe('BuildProfiler', function () { 'some-bundle/some-target': { startTime: 100503, endTime: 100504, - pureTime: 1, + selfTime: 1, totalTime: 1, watingTime: 0 }, 'another-bundle/another-target': { startTime: 100500, endTime: 100506, - pureTime: 5, + selfTime: 5, totalTime: 6, watingTime: 1 } @@ -168,14 +168,14 @@ describe('BuildProfiler', function () { 'some-bundle/some-target': { startTime: 100500, endTime: 100504, - pureTime: 4, + selfTime: 4, totalTime: 4, watingTime: 0 }, 'another-bundle/another-target': { startTime: 100501, endTime: 100510, - pureTime: 6, + selfTime: 6, totalTime: 9, watingTime: 3 } @@ -207,14 +207,14 @@ describe('BuildProfiler', function () { 'some-bundle/parallel-target-1': { startTime: 100500, endTime: 100504, - pureTime: 4, + selfTime: 4, totalTime: 4, watingTime: 0 }, 'some-bundle/parallel-target-2': { startTime: 100501, endTime: 100503, - pureTime: 2, + selfTime: 2, totalTime: 2, watingTime: 0 }