Skip to content

AppMenuSearch: small matchCache optimization #249

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

Closed
guiodic wants to merge 1 commit into from
Closed

AppMenuSearch: small matchCache optimization #249

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
31 changes: 22 additions & 9 deletions src/AppMenuSearch.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,15 +479,28 @@ QList<AppMenuSearch::SearchResult> AppMenuSearch::matchSearchCandidates(const QS

bool skippedTopLevel = false;
for (QAction *ancestor : std::as_const(candidate.ancestors)) {
if (ancestor) {
const QString text = getActionText(ancestor);
if (!text.isEmpty()) {
currentPath.append(text);
if (ignoreTopLevel && !skippedTopLevel) {
skippedTopLevel = true;
} else {
evalPathList.append(text);
}
if (!ancestor) {
continue;
}

// If we've already computed a MatchState for this ancestor earlier in
// this search pass, reuse its .text to avoid an extra getActionText() call.
QString text;
auto it = matchCache.find(ancestor);
if (it != matchCache.end()) {
text = it.value().text;
} else {
// Do not insert a synthetic entry into matchCache here: we only want
// to read previously-computed values to avoid polluting the cache.
text = getActionText(ancestor);
}

if (!text.isEmpty()) {
currentPath.append(text);
if (ignoreTopLevel && !skippedTopLevel) {
skippedTopLevel = true;
} else {
evalPathList.append(text);
}
}
}
Expand Down
Loading