Skip to content

Remove recursion in filterThreadToSearchString #5572

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
canova merged 2 commits into from
Sep 2, 2025
Merged

Remove recursion in filterThreadToSearchString #5572

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a4d4363
Remove recursion in filterThreadToSearchString.
mstange Aug 11, 2025
d52b3e2
Merge branch 'main' into faster-search-filter
canova Sep 2, 2025
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
46 changes: 20 additions & 26 deletions src/profile-logic/profile-data.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import {
} from 'firefox-profiler/app-logic/constants';
import { timeCode } from 'firefox-profiler/utils/time-code';
import { bisectionRight, bisectionLeft } from 'firefox-profiler/utils/bisect';
import { makeBitSet } from 'firefox-profiler/utils/bitset';
import { checkBit, makeBitSet, setBit } from 'firefox-profiler/utils/bitset';
import { parseFileNameFromSymbolication } from 'firefox-profiler/utils/special-paths';
import { StringTable } from 'firefox-profiler/utils/string-table';
import {
Expand Down Expand Up @@ -1504,7 +1504,7 @@ export function filterThreadToSearchString(
const { funcTable, frameTable, stackTable, stringTable, resourceTable } =
thread;

function computeFuncMatchesFilter(func: IndexIntoFuncTable) {
function computeFuncMatchesSearch(func: IndexIntoFuncTable) {
const nameIndex = funcTable.name[func];
const nameString = stringTable.getString(nameIndex);
if (nameString.toLowerCase().includes(lowercaseSearchString)) {
Expand All @@ -1531,38 +1531,32 @@ export function filterThreadToSearchString(
return false;
}

const funcMatchesFilterCache = new Map();
function funcMatchesFilter(func: IndexIntoFuncTable) {
let result = funcMatchesFilterCache.get(func);
if (result === undefined) {
result = computeFuncMatchesFilter(func);
funcMatchesFilterCache.set(func, result);
const funcMatchesSearch = makeBitSet(funcTable.length);

@canova canova Sep 2, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wohoo another use case of bitsets!

for (let funcIndex = 0; funcIndex < funcTable.length; funcIndex++) {
if (computeFuncMatchesSearch(funcIndex)) {
setBit(funcMatchesSearch, funcIndex);
}
return result;
}

const stackMatchesFilterCache = new Map();
function stackMatchesFilter(stackIndex: IndexIntoStackTable | null) {
if (stackIndex === null) {
return false;
}
let result = stackMatchesFilterCache.get(stackIndex);
if (result === undefined) {
const prefix = stackTable.prefix[stackIndex];
if (stackMatchesFilter(prefix)) {
result = true;
} else {
const frame = stackTable.frame[stackIndex];
const func = frameTable.func[frame];
result = funcMatchesFilter(func);
const stackMatchesSearch = makeBitSet(funcTable.length);
for (let stackIndex = 0; stackIndex < stackTable.length; stackIndex++) {
const prefix = stackTable.prefix[stackIndex];
if (prefix !== null && checkBit(stackMatchesSearch, prefix)) {
setBit(stackMatchesSearch, stackIndex);
} else {
const funcIndex = frameTable.func[stackTable.frame[stackIndex]];
if (checkBit(funcMatchesSearch, funcIndex)) {
setBit(stackMatchesSearch, stackIndex);
}
stackMatchesFilterCache.set(stackIndex, result);
}
return result;
}

// Set any stacks which don't include the search string to null.
// TODO: This includes stacks in markers; maybe we shouldn't clear marker stacks?

@canova canova Sep 2, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know why but I'm used to this version where we filter the marker stacks too. But maybe that's surprising for people?

return updateThreadStacks(thread, stackTable, (stackIndex) =>
stackMatchesFilter(stackIndex) ? stackIndex : null
stackIndex !== null && checkBit(stackMatchesSearch, stackIndex)
? stackIndex
: null
);
}

Expand Down