diff --git a/src/transport_layer/etcp_tx.c b/src/transport_layer/etcp_tx.c index d632efd85..2789c084d 100644 --- a/src/transport_layer/etcp_tx.c +++ b/src/transport_layer/etcp_tx.c @@ -20,7 +20,13 @@ uint32_t etcp_tx_rto_us(const struct ETCP_LINK* link) { if ((uint64_t)link->rtt_last * 100 > rtt) rtt = (uint64_t)link->rtt_last * 100; uint64_t rto = rtt ? (12 * rtt + 15ULL * link->data_jitter_us + 9) / 10 + 3000 : 1000000; if (rto < 10000) rto = 10000; - if (rto > 1000000) rto = 1000000; + /* RTO должен покрывать измеренный RTT: потолок 1s вызывал повторы ещё стоящих в BLE-очереди кадров. */ + if (rto > UINT32_MAX) { + DEBUG_WARN(DEBUG_CATEGORY_ETCP, "RTO saturated link=%u DATA_RTT_us=%u KA_RTT_us=%llu jitter_us=%u computed_us=%llu", + link->local_link_id, link->data_rtt_us, (unsigned long long)link->rtt_last * 100, + link->data_jitter_us, (unsigned long long)rto); + rto = UINT32_MAX; + } return (uint32_t)rto; } diff --git a/tests/test_etcp_windows.c b/tests/test_etcp_windows.c index 49ce4a96c..81f0ce4e6 100644 --- a/tests/test_etcp_windows.c +++ b/tests/test_etcp_windows.c @@ -382,19 +382,21 @@ static void retransmission_timeout(void) { const struct { uint32_t rtt_us, jitter_us; uint16_t ka_rtt_tb; uint32_t expected_us; } cases[] = { {0, 0, 0, 1000000}, {0, UINT32_MAX, 0, 1000000}, {2000, 1000, 0, 10000}, {20000, 0, 0, 27000}, {20000, 7500, 0, 38250}, {200000, 10000, 0, 258000}, - {600000, 100000, 0, 873000}, {1000000, 0, 0, 1000000}, {UINT32_MAX, UINT32_MAX, 0, 1000000}, + {600000, 100000, 0, 873000}, {1000000, 0, 0, 1203000}, {UINT32_MAX, UINT32_MAX, 0, UINT32_MAX}, + {2000000, 0, 0, 2403000}, {2000000, 200000, 0, 2703000}, {5833, 0, 0, 10000}, {5834, 0, 0, 10001}, {20001, 1, 0, 27003}, {20000, 10000, 0, 42000}, {200000, 100000, 0, 393000}, - {0, 0, 200, 27000}, {20000, 0, 6000, 723000}, {0, 0, UINT16_MAX, 1000000}, + {0, 0, 200, 27000}, {20000, 0, 6000, 723000}, {0, 0, UINT16_MAX, 7867200}, {20000, 0, 1000, 123000}, {20000, 7500, 1000, 134250}, - {200000, 0, 200, 243000}, {20000, 0, 1, 27000}, {20000, 0, UINT16_MAX, 1000000}, - {830832, 0, 0, 999999}, {830833, 0, 0, 1000000}, {830834, 0, 0, 1000000} + {200000, 0, 200, 243000}, {20000, 0, 1, 27000}, {20000, 0, UINT16_MAX, 7867200}, + {830832, 0, 0, 999999}, {830833, 0, 0, 1000000}, {830834, 0, 0, 1000001} }; for (unsigned i = 0; i < sizeof(cases) / sizeof(cases[0]); i++) { setup(); b->link_status = 0; conn->rtt_avg_10 = UINT16_MAX; conn->jitter = UINT16_MAX; // Общие/чужие метрики не участвуют в RTO этого пути. a->rtt_last = cases[i].ka_rtt_tb; a->data_rtt_us = cases[i].rtt_us; a->data_jitter_us = cases[i].jitter_us; CHECK(etcp_tx_rto_us(a) == cases[i].expected_us); + if (cases[i].expected_us == UINT32_MAX) { teardown(); continue; } // Проверка насыщения, без ожидания часа. fill(a, 1, 100); struct INFLIGHT_PACKET* packet = (struct INFLIGHT_PACKET*)conn->input_wait_ack->head; uint64_t sent = last_attempt(packet)->sent_at_us, deadline = sent + cases[i].expected_us + 100000; @@ -762,20 +764,23 @@ static void enable_models(void) { /* Скачок RTT не уничтожает попытку до прихода ACK; уже назначенный ранний таймер проверяет новый RTO. */ static void rto_path_rtt_growth(void) { + const struct { uint16_t ka_rtt_tb; unsigned wait_tb; } cases[] = {{1000, 1000}, {20000, 15000}}; + for (unsigned i = 0; i < sizeof(cases) / sizeof(cases[0]); i++) { setup(); enable_models(); b->link_status = 0; a->data_rtt_us = 20000; a->rtt_last = 200; fill(a,1,1000); struct INFLIGHT_PACKET* packet = (struct INFLIGHT_PACKET*)conn->input_wait_ack->head; uint32_t seq = packet->seq; uint64_t id = packet->last_attempt_id; - a->rtt_last = 1000; - test_clock_run_for(ua,1000); + a->rtt_last = cases[i].ka_rtt_tb; + test_clock_run_for(ua,cases[i].wait_tb); DEBUG_INFO(DEBUG_CATEGORY_DEBUG, "RTO after path RTT growth: DATA_us=%u KA_us=%u RTO_us=%u attempts=%u retries=%u stalled=%u", a->data_rtt_us,a->rtt_last*100,etcp_tx_rto_us(a),a->inflight_packets,conn->retransmissions_count,a->tx_stalled); CHECK(queue_find_data_by_index(a->attempts,&id) && !conn->retransmissions_count && !a->tx_stalled); etcp_tx_ack(a,seq,id,0,0,0); - CHECK(a->data_rtt_us > 20000 && bbr_calls == 1 && last_sample.rtt_us >= 100000); + CHECK(a->data_rtt_us > 20000 && bbr_calls == 1 && last_sample.rtt_us >= cases[i].wait_tb * 100); CHECK(a->acked_packets == 1 && !a->inflight_bytes && !conn->unacked_bytes); teardown(); + } } /* Timestamp сокращает срок без DATA/ACK; проверяем OOM и close из уведомления RTT внутри RX. */