Skip to content

Revert the removal of the "optimizations" property in importers for linux perf and ART #4549

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
julienw merged 2 commits into from
Mar 28, 2023
Merged

Revert the removal of the "optimizations" property in importers for linux perf and ART #4549

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
5bde5d2
Revert the removal of the "optimizations" property in importers for l…
julienw Mar 27, 2023
b761708
Merge branch 'main' into 4547-fix-importers
julienw Mar 28, 2023
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
7 changes: 4 additions & 3 deletions src/profile-logic/import/art-trace.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -759,8 +759,9 @@ class ThreadBuilder {
schema: {
location: 0,
implementation: 1,
line: 2,
category: 3,
optimizations: 2,
line: 3,
category: 4,
},
data: [],
};
Expand Down Expand Up @@ -832,7 +833,7 @@ class ThreadBuilder {
this._stringTable.push(methodString);
const category = this._categoryInfo.inferJavaCategory(methodString);
frame = this._frameTable.data.length;
this._frameTable.data.push([stringIndex, null, null, category]);
this._frameTable.data.push([stringIndex, null, null, null, category]);
this._frameMap.set(methodId, frame);
}
return frame;
Expand Down
11 changes: 7 additions & 4 deletions src/profile-logic/import/linux-perf.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,11 @@ export function convertPerfScriptProfile(
relevantForJS: 1,
innerWindowID: 2,
implementation: 3,
line: 4,
column: 5,
category: 6,
subcategory: 7,
optimizations: 4,
line: 5,
column: 6,
category: 7,
subcategory: 8,
},
data: [],
};
Expand Down Expand Up @@ -152,6 +153,7 @@ export function convertPerfScriptProfile(
? KERNEL_CATEGORY_INDEX
: USER_CATEGORY_INDEX;
const implementation = null;
const optimizations = null;
const line = null;
const relevantForJS = false;
const subcategory = null;
Expand All @@ -162,6 +164,7 @@ export function convertPerfScriptProfile(
relevantForJS,
innerWindowID,
implementation,
optimizations,
line,
column,
category,
Expand Down
Loading