Skip to content

Fix cumulative value calculation for recursive functions in Table view #6128

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
secfree wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix cumulative value calculation for recursive functions in Table view #6128

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
35 changes: 29 additions & 6 deletions pkg/query/table.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,10 @@ func generateTableArrowRecord(

for sampleRow := 0; sampleRow < int(r.Record.NumRows()); sampleRow++ {
previousTableRow := -1
// Track which table rows have been counted for this sample to avoid
// double-counting cumulative values for recursive functions.
seenInSample := make(map[int]struct{})

lOffsetStart, lOffsetEnd := r.Locations.ValueOffsets(sampleRow)
for locationRow := int(lOffsetStart); locationRow < int(lOffsetEnd); locationRow++ {
if r.Locations.ListValues().IsNull(locationRow) {
Expand Down Expand Up @@ -164,10 +168,17 @@ func generateTableArrowRecord(
} else {
tb.addresses[string(buildID)][addr] = tableRow
}
seenInSample[tableRow] = struct{}{}
previousTableRow = tableRow
tableRow++
} else {
tb.mergeRow(r, cr, sampleRow, locationRow, -1, tb.addresses[unsafeString(buildID)][addr], previousTableRow, isLeaf)
// Only add to cumulative if this is the first occurrence in this sample
_, alreadySeen := seenInSample[cr]
addCumulative := !alreadySeen
if addCumulative {
seenInSample[cr] = struct{}{}
}
tb.mergeRow(r, cr, sampleRow, locationRow, -1, tb.addresses[unsafeString(buildID)][addr], previousTableRow, isLeaf, addCumulative)
previousTableRow = tb.addresses[unsafeString(buildID)][addr]
}
} else {
Expand All @@ -184,10 +195,17 @@ func generateTableArrowRecord(
return nil, 0, err
}
tb.functions[string(fn)] = tableRow
seenInSample[tableRow] = struct{}{}
previousTableRow = tableRow
tableRow++
} else {
tb.mergeRow(r, cr, sampleRow, locationRow, lineRow, tb.functions[unsafeString(fn)], previousTableRow, isLeaf)
// Only add to cumulative if this is the first occurrence in this sample
_, alreadySeen := seenInSample[cr]
addCumulative := !alreadySeen
if addCumulative {
seenInSample[cr] = struct{}{}
}
tb.mergeRow(r, cr, sampleRow, locationRow, lineRow, tb.functions[unsafeString(fn)], previousTableRow, isLeaf, addCumulative)
previousTableRow = tb.functions[unsafeString(fn)]
}
}
Expand Down Expand Up @@ -432,10 +450,15 @@ func (tb *tableBuilder) appendRow(
return nil
}

func (tb *tableBuilder) mergeRow(r *profile.RecordReader, mergeRow, sampleRow, _, lineRow, currentTableRow, previousTableRow int, isLeaf bool) {
tb.builderCumulative.Add(mergeRow, r.Value.Value(sampleRow))
if r.Diff.Value(sampleRow) != 0 {
tb.builderCumulativeDiff.Add(mergeRow, r.Diff.Value(sampleRow))
// mergeRow merges sample data into an existing table row.
// If addCumulative is false, only caller/callee relationships and flat values (if leaf) are updated.
// This is used to avoid double-counting cumulative values for recursive functions.
func (tb *tableBuilder) mergeRow(r *profile.RecordReader, mergeRow, sampleRow, _, lineRow, currentTableRow, previousTableRow int, isLeaf, addCumulative bool) {
if addCumulative {
tb.builderCumulative.Add(mergeRow, r.Value.Value(sampleRow))
if r.Diff.Value(sampleRow) != 0 {
tb.builderCumulativeDiff.Add(mergeRow, r.Diff.Value(sampleRow))
}
}

if isLeaf {
Expand Down