Support simple perf output #2011
Conversation
| @@ -27,6 +27,29 @@ describe('converting Linux perf profile', function() { | |||
| } | |||
| expect(version).toEqual(CURRENT_GECKO_VERSION); | |||
| }); | |||
|
|
|||
| it('should import a simple perf profile', async function() { | |||
There was a problem hiding this comment.
I checked that this test throws on master.
julienw
force-pushed
the
handle-simple-perf-output
branch
from
36dacd1 to
67e9e04
Compare
Codecov Report
@@ Coverage Diff @@
## master #2011 +/- ##
=========================================
+ Coverage 84.79% 84.8% +<.01%
=========================================
Files 191 191
Lines 13013 13015 +2
Branches 3245 3246 +1
=========================================
+ Hits 11035 11037 +2
Misses 1797 1797
Partials 181 181
Continue to review full report at Codecov.
|
| // | | | +- unknown number between brackets (optional) | ||
| // | | | | +- timestamp | ||
| // vvvvv vvvvvvvvv vvv vvvvvvvvvvvvvv vvvvvv | ||
| return /^\S.+?\s+(?:\d+\/)?\d+\s+(?:\[\d+\]\s+)?[\d.]+:/.test(firstLine); |
There was a problem hiding this comment.
I completely rewrote this regexp to make it look closer to the other regexps in the same file.
julienw
force-pushed
the
handle-simple-perf-output
branch
from
67e9e04 to
90bb04c
Compare
julienw
force-pushed
the
handle-simple-perf-output
branch
from
90bb04c to
ebe711e
Compare
| @@ -133,25 +139,29 @@ export function convertPerfScriptProfile(profile: string): Object { | |||
| let startTime = 0; | |||
| while (lineIndex < lines.length) { | |||
| const sampleStartLine = lines[lineIndex++]; | |||
| if (sampleStartLine === '') { | |||
| continue; | |||
| } | |||
There was a problem hiding this comment.
This helps avoid some useless warning.
| // | | +- tid | ||
| // | | | +- end of word (space or end of string) | ||
| // vvvv vvvvvvvvvvv vvvvv v | ||
| const threadNamePidAndTidMatch = /^(.*)\s+(?:(\d+)\/)?(\d+)\b/.exec( |
There was a problem hiding this comment.
look, a \s instead of a space, to match tabs!
| // First, get the sample's time stamp and whatever comes before the timeStamp: | ||
| const sampleStartMatch = /^(.*) ([\d.]+):/.exec(sampleStartLine); | ||
| // First, get the sample's time stamp and whatever comes before the timestamp: | ||
| const sampleStartMatch = /^(.*)\s+([\d.]+):/.exec(sampleStartLine); |
There was a problem hiding this comment.
look, a \s instead of a space, to match tabs!
| if (!sampleStartMatch) { | ||
| console.log( | ||
| 'Could not parse line as the start of a sample in the "perf script" profile format:', | ||
| 'Could not parse line as the start of a sample in the "perf script" profile format: "%s"', |
There was a problem hiding this comment.
This makes it easier to see the result when the string is empty.
|
Hey @jesup, I flagged you for a review because you wrote the initial implementation and have some knowledge of the simple perf format. But please tell me if you'd rather have somebody else to review it :) |
Fixes #1792
deploy preview