Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-26 21:03:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Reduce memory allocations for deduping completions

Browse source 
Instead of adding the completions themselves to an `unordered_set` to
see if any are duplicates, just add a reference to the item instead.
This commit is contained in:
Mahmoud Al-Qudsi 2022-09-16 21:35:29 -05:00
parent 3ef047f242
commit d5561623aa
1 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/complete.cpp
View file

@ -273,12 +273,25 @@ __attribute__((always_inline)) static inline bool compare_completions_by_tilde(
}
/// Unique the list of completions, without perturbing their order.
static void unique_completions_retaining_order(completion_list_t *comps) {
std::unordered_set<wcstring> seen;
static void dedup_completions_retaining_order(completion_list_t *comps) {
struct ref_hash_t {
size_t operator()(const wcstring &val) const {
return std::hash<const wcstring>()(val);
}
};
struct ref_equal_t {
bool operator()(const wcstring &lhs, const wcstring &rhs) const {
return lhs == rhs;
}
};
std::unordered_set<std::reference_wrapper<const wcstring>, ref_hash_t, ref_equal_t> seen;
seen.reserve(comps->size());
auto pred = [&seen](const completion_t &c) {
// Remove (return true) if insertion fails.
bool inserted = seen.insert(c.completion).second;
auto r = std::reference_wrapper<const wcstring>(c.completion);
bool inserted = seen.insert(r).second;
return !inserted;
};
comps->erase(std::remove_if(comps->begin(), comps->end(), pred), comps->end());
@ -299,7 +312,7 @@ void completions_sort_and_prioritize(completion_list_t *comps, completion_reques
comps->end());
// Deduplicate both sorted and unsorted results.
unique_completions_retaining_order(comps);
dedup_completions_retaining_order(comps);
// Sort, provided COMPLETE_DONT_SORT isn't set.
// Here we do not pass suppress_exact, so that exact matches appear first.