summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJohannes Altmanninger <aclopte@gmail.com>2022-08-17 00:11:26 +0200
committerJohannes Altmanninger <aclopte@gmail.com>2022-09-17 06:44:57 -0500
commita33ec8dc809e7ffcb9db90f30c554d09883b0f48 (patch)
tree3f31b119ba468b2917d829610f3d10da555ff9e6 /src
parent674053935d3260dd54c4e0084c76e9170d731eb2 (diff)
Avoid potentially quadratic runtime when updating selections after modification
LineRangeSet::add_range() calls Vector::erase() in a loop over the same vector. This could cause performance problems when there are many selections. Fix this by only calling Vector::erase() once. I didn't measure anything because my benchmark is dominated by another issue (see next commit). LineRangeSet::remove_range() also has a suspicious call to erase() but that one is only used in test code, so it doesn't matter.
Diffstat (limited to 'src')
-rw-r--r--src/line_modification.cc13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/line_modification.cc b/src/line_modification.cc
index 8551e394..f63bc6ea 100644
--- a/src/line_modification.cc
+++ b/src/line_modification.cc
@@ -147,26 +147,27 @@ void LineRangeSet::update(ConstArrayView<LineModification> modifs)
void LineRangeSet::add_range(LineRange range, FunctionRef<void (LineRange)> on_new_range)
{
- auto it = std::lower_bound(begin(), end(), range.begin,
- [](LineRange range, LineCount line) { return range.end < line; });
- if (it == end() or it->begin > range.end)
+ auto insert_at = std::lower_bound(begin(), end(), range.begin,
+ [](LineRange range, LineCount line) { return range.end < line; });
+ if (insert_at == end() or insert_at->begin > range.end)
on_new_range(range);
else
{
auto pos = range.begin;
- while (it != end() and it->begin <= range.end)
+ auto it = insert_at;
+ for (; it != end() and it->begin <= range.end; ++it)
{
if (pos < it->begin)
on_new_range({pos, it->begin});
range = LineRange{std::min(range.begin, it->begin), std::max(range.end, it->end)};
pos = it->end;
- it = erase(it);
}
+ insert_at = erase(insert_at, it);
if (pos < range.end)
on_new_range({pos, range.end});
}
- insert(it, range);
+ insert(insert_at, range);
}
void LineRangeSet::remove_range(LineRange range)