Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fix profiler #482

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 24, 2016
Merged

Fix profiler #482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b7b5427
fix(profiler): use node profiler for node
Jun 17, 2016
592a2cd
refactor(profiler): rename `pureTime` to `selfTime`
Jun 17, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions lib/build-profiler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ module.exports = inherit(/** @lends BuildProfiler.prototype */ {
* @param {String[]} deps
*/
_calculateTargetBuildTime: function (targetName, deps) {
var pureTime = 0;
var selfTime = 0;
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍
BTW, разве теперь нельзя коммит в целом комментировать? о_О

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Я такого не видел =)

var targetTimes = this._buildTimes[targetName];
var targetStartTime = targetTimes.startTime;
var targetEndTime = targetTimes.endTime;
Expand All @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion lib/make.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

А конкретно это изменение что делает?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Каждая нода ожидает такой sub-профайлер, у которого setStartTime и setEndTime принимают target и дёргают аналогичные методы у общего профайлера, подставляя текущую ноду.

enb/lib/make.js

Lines 135 to 150 in 4422818

getNodeProfiler: function (nodeName) {
var profiler = this._profiler;
return {
setStartTime: function (target) {
var filename = path.join(nodeName, target);
return profiler.setStartTime(filename);
},
setEndTime: function (target) {
var filename = path.join(nodeName, target);
return profiler.setEndTime(filename);
}
};
},

Без этого изменения не будет считаться waitTime, ну и возможны коллизии по названиям таргетов.

node.setLogger(this._logger.subLogger(nodePath));
this._nodes[nodePath] = node;
this._nodeInitPromises[nodePath] = vowFs.makeDir(path.join(cdir, nodePath))
Expand Down
16 changes: 8 additions & 8 deletions test/lib/build-profiler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down Expand Up @@ -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
}
Expand All @@ -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
}
Expand Down Expand Up @@ -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
}
Expand Down