only cound a ce once

This commit is contained in:
Green Sky 2023-09-02 13:28:32 +02:00
parent 81a353570b
commit 1e6929c93b
No known key found for this signature in database
2 changed files with 36 additions and 19 deletions

View File

@ -51,7 +51,7 @@ std::vector<FlowOnly::SeqIDType> FlowOnly::getTimeouts(void) const {
// after 3 rtt delay, we trigger timeout // after 3 rtt delay, we trigger timeout
const auto now_adjusted = getTimeNow() - getCurrentDelay()*3.f; const auto now_adjusted = getTimeNow() - getCurrentDelay()*3.f;
for (const auto& [seq, time_stamp, size] : _in_flight) { for (const auto& [seq, time_stamp, size, _] : _in_flight) {
if (now_adjusted > time_stamp) { if (now_adjusted > time_stamp) {
list.push_back(seq); list.push_back(seq);
} }
@ -63,11 +63,17 @@ std::vector<FlowOnly::SeqIDType> FlowOnly::getTimeouts(void) const {
void FlowOnly::onSent(SeqIDType seq, size_t data_size) { void FlowOnly::onSent(SeqIDType seq, size_t data_size) {
if constexpr (true) { if constexpr (true) {
for (const auto& it : _in_flight) { for (const auto& it : _in_flight) {
assert(std::get<0>(it) != seq); assert(it.id != seq);
} }
} }
_in_flight.push_back({seq, getTimeNow(), data_size + SEGMENT_OVERHEAD}); _in_flight.push_back(
FlyingBunch{
seq,
static_cast<float>(getTimeNow()),
data_size + SEGMENT_OVERHEAD
}
);
_in_flight_bytes += data_size + SEGMENT_OVERHEAD; _in_flight_bytes += data_size + SEGMENT_OVERHEAD;
//_recently_sent_bytes += data_size + SEGMENT_OVERHEAD; //_recently_sent_bytes += data_size + SEGMENT_OVERHEAD;
} }
@ -84,21 +90,23 @@ void FlowOnly::onAck(std::vector<SeqIDType> seqs) {
{ // skip in ack is congestion event { // skip in ack is congestion event
// 1. look at primary ack of packet // 1. look at primary ack of packet
auto it = std::find_if(_in_flight.begin(), _in_flight.end(), [seq = seqs.front()](const auto& v) -> bool { auto it = std::find_if(_in_flight.begin(), _in_flight.end(), [seq = seqs.front()](const auto& v) -> bool {
return std::get<0>(v) == seq; return v.id == seq;
}); });
if (it != _in_flight.end()) { if (it != _in_flight.end() && !it->ignore) {
if (it != _in_flight.begin()) { // find first non ignore, it should be the expected
// not next expected seq -> skip detected auto first_it = std::find_if_not(_in_flight.cbegin(), _in_flight.cend(), [](const auto& v) -> bool { return v.ignore; });
// TODO: change expectations of next seq in order, so we dont trigger a flood of ce if (first_it != _in_flight.cend() && it != first_it) {
// not next expected seq -> skip detected
//std::cout << "CONGESTION out of order\n"; //std::cout << "CONGESTION out of order\n";
onCongestion(); onCongestion();
it->ignore = true; // only throw once
} else { } else {
// only mesure delay, if not a congestion // only mesure delay, if not a congestion
addRTT(now - std::get<1>(*it)); addRTT(now - it->timestamp);
} }
} else { } else { // TOOD: if ! ignore too
// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
#if 0 #if 0
// assume we got a duplicated packet // assume we got a duplicated packet
@ -110,14 +118,14 @@ void FlowOnly::onAck(std::vector<SeqIDType> seqs) {
for (const auto& seq : seqs) { for (const auto& seq : seqs) {
auto it = std::find_if(_in_flight.begin(), _in_flight.end(), [seq](const auto& v) -> bool { auto it = std::find_if(_in_flight.begin(), _in_flight.end(), [seq](const auto& v) -> bool {
return std::get<0>(v) == seq; return v.id == seq;
}); });
if (it == _in_flight.end()) { if (it == _in_flight.end()) {
continue; // not found, ignore continue; // not found, ignore
} else { } else {
//most_recent = std::max(most_recent, std::get<1>(*it)); //most_recent = std::max(most_recent, std::get<1>(*it));
_in_flight_bytes -= std::get<2>(*it); _in_flight_bytes -= it->bytes;
assert(_in_flight_bytes >= 0); assert(_in_flight_bytes >= 0);
//_recently_acked_data += std::get<2>(*it); //_recently_acked_data += std::get<2>(*it);
_in_flight.erase(it); _in_flight.erase(it);
@ -127,8 +135,8 @@ void FlowOnly::onAck(std::vector<SeqIDType> seqs) {
void FlowOnly::onLoss(SeqIDType seq, bool discard) { void FlowOnly::onLoss(SeqIDType seq, bool discard) {
auto it = std::find_if(_in_flight.begin(), _in_flight.end(), [seq](const auto& v) -> bool { auto it = std::find_if(_in_flight.begin(), _in_flight.end(), [seq](const auto& v) -> bool {
assert(!std::isnan(std::get<1>(v))); assert(!std::isnan(v.timestamp));
return std::get<0>(v) == seq; return v.id == seq;
}); });
if (it == _in_flight.end()) { if (it == _in_flight.end()) {
@ -140,13 +148,14 @@ void FlowOnly::onLoss(SeqIDType seq, bool discard) {
// "if data lost is not to be retransmitted" // "if data lost is not to be retransmitted"
if (discard) { if (discard) {
_in_flight_bytes -= std::get<2>(*it); _in_flight_bytes -= it->bytes;
assert(_in_flight_bytes >= 0); assert(_in_flight_bytes >= 0);
_in_flight.erase(it); _in_flight.erase(it);
} } else {
// TODO: reset timestamp?
// and not take into rtt // and not take into rtt
it->timestamp = getTimeNow();
it->ignore = true;
}
// no ce, since this is usually after data arrived out-of-order/duplicate // no ce, since this is usually after data arrived out-of-order/duplicate
} }

View File

@ -31,7 +31,15 @@ struct FlowOnly : public CCAI {
float _rtt_ema {0.1f}; float _rtt_ema {0.1f};
// list of sequence ids and timestamps of when they where sent (and payload size) // list of sequence ids and timestamps of when they where sent (and payload size)
std::vector<std::tuple<SeqIDType, float, size_t>> _in_flight; struct FlyingBunch {
SeqIDType id;
float timestamp;
size_t bytes;
// set to true if counted as ce or resent due to timeout
bool ignore {false};
};
std::vector<FlyingBunch> _in_flight;
int64_t _in_flight_bytes {0}; int64_t _in_flight_bytes {0};
clock::time_point _time_start_offset; clock::time_point _time_start_offset;