Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 01:03:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix LossList::insert

Browse source
This commit is contained in:
Atlante45 2015-08-03 12:12:21 -07:00
parent e182bbbc1b
commit 00ab4a58f3
1 changed files with 17 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
libraries/networking/src/udt/LossList.cpp
View file

@ -51,10 +51,10 @@ void LossList::insert(SequenceNumber start, SequenceNumber end) {
return pair.second < start;
});
if (it == _lossList.end()) {
if (it == _lossList.end() || end < it->first) {
// No overlap, simply insert
_lossList.insert(it, make_pair(start, end));
_length += seqlen(start, end);
_lossList.insert(it, make_pair(start, end));
} else {
// If it starts before segment, extend segment
if (start < it->first) {
@ -62,31 +62,25 @@ void LossList::insert(SequenceNumber start, SequenceNumber end) {
it->first = start;
}
// If it ends after segment, extend segment
if (end > it->second) {
// If it goes further, find the actual end
auto it2 = find_if_not(it, _lossList.end(), [&end](pair<SequenceNumber, SequenceNumber> pair){
return end <= pair.second;
});
--it2;
// If it ends inside a segment, change end (segment will be deleted)
// Or backup iterator so segment doesn't get deleted
if (it2->first <= end) {
end = it2->second;
} else {
--it2;
}
// Change the end of the original segment
_length += seqlen(it->second + 1, end);
it->second = end;
// remove all underlapping segments
++it; ++it2;
while (it != it2) {
_length -= seqlen(it->first, it->second);
it = _lossList.erase(it);
}
auto it2 = it;
++it2;
// For all ranges touching the current range
while (it2 != _lossList.end() && it->second >= it2->first - 1) {
// extend current range if necessary
if (it->second < it2->second) {
_length += seqlen(it->second + 1, it2->second);
it->second = it2->second;
}
// Remove overlapping range
_length -= seqlen(it2->first, it2->second);
it2 = _lossList.erase(it2);
}
}
}