Skip to content

Updated locations toggle on a call frame page #13

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

Open
exdis wants to merge 1 commit into
base: lines
Choose a base branch
from
+82 −10
Open

Updated locations toggle on a call frame page #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 9 additions & 0 deletions app/pages/call-frame.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,12 @@
overflow-x: auto;
overflow-y: hidden;
}

.page-call-frame .view-toggle-group.view-call-frame__locations-source {
position: sticky;
top: 6px;
z-index: 101;
display: flex;
width: fit-content;
margin: 0 0 -28px auto;
}
81 changes: 72 additions & 9 deletions app/pages/call-frame.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,11 +197,28 @@ const pageContent = [

{
view: 'update-on-line-metrics-changes',
metrics: '=scopeLine().dict.callFrames.filtered',
content: `page-indicator-metrics:{
full: scopeLine().dict.callFrames.all.entries[=>entry = @],
filtered: scopeLine().dict.callFrames.filtered.entries[=>entry = @]
}`
metrics: '=scopeLine() | #.locationsSource = "vector" and locations ? locations.filtered : dict.callFrames.filtered',
content: `page-indicator-metrics:
$cf: @;
$line: scopeLine();
#.locationsSource = "vector" and $line.locations
? {
full: $line.locations.all.entries.[entry.callFrame = $cf] | {
selfValue: sum(=>selfValue),
nestedValue: 0,
totalValue: sum(=>selfValue)
},
filtered: $line.locations.filtered.entries.[entry.callFrame = $cf] | {
selfValue: sum(=>selfValue),
nestedValue: 0,
totalValue: sum(=>selfValue)
}
}
: {
full: $line.dict.callFrames.all.entries[=>entry = $cf],
filtered: $line.dict.callFrames.filtered.entries[=>entry = $cf]
}
`
},

{
Expand All @@ -228,16 +245,34 @@ const pageContent = [
view: 'expand',
when: '#.scopeProfile | memline | valueLifespans and valueTypes',
className: 'trigger-outside',
data: '{ callFrame: @, matrix: #.scopeProfile.memline | tree.callFrames.all.tree.allocationsMatrix(samplesMetrics, @) }',
data: `
$line: #.scopeProfile.memline;
$cf: @;
$matrix: #.locationsSource = "vector" and $line.locations
? $line.locations.all.allocationsMatrix(
{ ...$line.samplesMetrics, samples: $line.locations.sampleToLocation },
=> callFrame = $cf
)
: $line.tree.callFrames.all.tree.allocationsMatrix($line.samplesMetrics, $cf);

{ callFrame: $cf, matrix: $matrix }
`,
...sessionExpandState('callframe-allocations-matrix', true, '$'),
header: 'text:"Allocation types"',
content: {
view: 'update-on-line-metrics-changes',
metrics: '=#.scopeProfile.memline.dict.callFrames.filtered',
metrics: '=#.scopeProfile.memline | #.locationsSource = "vector" and locations ? locations.filtered : dict.callFrames.filtered',
content: {
view: 'allocation-samples-matrix',
data: `
$filtered: #.scopeProfile.memline | tree.callFrames.all.tree.allocationsMatrix(samplesMetricsFiltered, @.callFrame);
$line: #.scopeProfile.memline;
$cf: @.callFrame;
$filtered: #.locationsSource = "vector" and $line.locations
? $line.locations.all.allocationsMatrix(
{ ...$line.samplesMetricsFiltered, samples: $line.locations.sampleToLocation },
=> callFrame = $cf
)
: $line.tree.callFrames.all.tree.allocationsMatrix($line.samplesMetricsFiltered, $cf);

matrix.($type; $filtered[=>type = $type] or { $type })
`
Expand Down Expand Up @@ -351,6 +386,25 @@ discovery.page.define('call-frame', {
} },
{ content: {
view: 'context',
modifiers: [
{
view: 'toggle-group',
className: 'view-call-frame__locations-source',
name: 'locationsSource',
whenData: 'scopeLine() | dict.locations and locations',
value: '="getSessionSetting".callAction("call-frame-source__line-locations", "tree")',
data: [
{
value: 'tree',
text: 'Tree locations'
},
{
value: 'vector',
text: 'Vector locations'
}
]
}
],
context: (data, context) => {
const scopeLine = resolveScopeProfileLine(null, context);
const scopeProfile = scopeLine.profile;
Expand All @@ -365,6 +419,7 @@ discovery.page.define('call-frame', {

return {
...context,
locationsSourceControlled: true,
subsetTreeValues: new SubsetTreeMetrics(
new SubsetCallTree(callFramesTree, data),
samplesMetrics
Expand All @@ -381,7 +436,15 @@ discovery.page.define('call-frame', {
: null
};
},
content: pageContent
content: {
view: 'block',
postRender(el, _, data, context) {
if (context.locationsSource) {
context.actions.setSessionSetting?.('call-frame-source__line-locations', context.locationsSource);
}
},
content: pageContent
}
} }
]
});
2 changes: 1 addition & 1 deletion app/views/source/call-frame-source.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ discovery.view.define('call-frame-source', {
{
view: 'toggle-group',
name: 'locationsSource',
whenData: 'scopeLine() | dict.locations and locations',
whenData: 'not #.locationsSourceControlled and (scopeLine() | dict.locations and locations)',
value: '="getSessionSetting".callAction("call-frame-source__line-locations", "tree")',
data: [
{
Expand Down