Skip to content

lib: fix version check in tick processor #16769

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
bnoordhuis merged 3 commits into from
Nov 7, 2017
Merged

lib: fix version check in tick processor #16769

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
421316d
lib: fix version check in tick processor
bnoordhuis Nov 5, 2017
09d22dd
lib: shuffle v8_prof_polyfill.js for unit testing
bnoordhuis Nov 5, 2017
698bb96
test: tick processor version check regression test
bnoordhuis Nov 5, 2017
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
Prev Previous commit
Next Next commit
lib: shuffle v8_prof_polyfill.js for unit testing 
Make it possible to test the versionCheck() function from that file in
isolation.

PR-URL: #16769
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
  • Loading branch information
@bnoordhuis
bnoordhuis committed Nov 7, 2017
commit 09d22ddab5eded7790b68059d91186117c43f3b7
38 changes: 25 additions & 13 deletions lib/internal/v8_prof_polyfill.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,13 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

module.exports = { versionCheck };

// Don't execute when required directly instead of being eval'd from
// lib/internal/v8_prof_processor.js. This way we can test functions
// from this file in isolation.
if (module.id === 'internal/v8_prof_polyfill') return;

// Node polyfill
const fs = require('fs');
const cp = require('child_process');
Expand Down Expand Up @@ -64,7 +71,18 @@ const fd = fs.openSync(logFile, 'r');
const buf = Buffer.allocUnsafe(4096);
const dec = new (require('string_decoder').StringDecoder)('utf-8');
var line = '';
versionCheck();

{
const message = versionCheck(peekline(), process.versions.v8);
if (message) console.log(message);
}

function peekline() {
const s = readline();
line = s + '\n' + line;
return s;
}

function readline() {
while (true) {
const lineBreak = line.indexOf('\n');
Expand All @@ -81,27 +99,21 @@ function readline() {
}
}

function versionCheck() {
function versionCheck(firstLine, expected) {
// v8-version looks like
// "v8-version,$major,$minor,$build,$patch[,$embedder],$candidate"
// whereas process.versions.v8 is either "$major.$minor.$build-$embedder" or
// "$major.$minor.$build.$patch-$embedder".
var firstLine = readline();
line = firstLine + '\n' + line;
firstLine = firstLine.split(',');
const curVer = process.versions.v8.split(/[.\-]/);
const curVer = expected.split(/[.\-]/);
if (firstLine.length !== 6 && firstLine.length !== 7 ||
firstLine[0] !== 'v8-version') {
console.log('Unable to read v8-version from log file.');
return;
return 'Unable to read v8-version from log file.';
}
// Compare major, minor and build; ignore the patch and candidate fields.
for (var i = 0; i < 3; i++) {
if (curVer[i] !== firstLine[i + 1]) {
console.log('Testing v8 version different from logging version');
return;
}
}
for (var i = 0; i < 3; i++)
if (curVer[i] !== firstLine[i + 1])
return 'Testing v8 version different from logging version';
}

function macCppfiltNm(out) {
Expand Down