From e82a95d529b68fc31b59d672839e71a95fd9625b Mon Sep 17 00:00:00 2001 From: jeka Date: Mon, 6 Apr 2026 21:18:58 +0300 Subject: [PATCH] 1 --- src/etcp.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/etcp.c b/src/etcp.c index a2261a7..41860c5 100644 --- a/src/etcp.c +++ b/src/etcp.c @@ -547,7 +547,7 @@ static void input_queue_cb(struct ll_queue* q, void* arg) { // memory_pool_free(etcp->io_pool, in_pkt);// перемещаем из io_pool в inflight_pool queue_entry_free(&in_pkt->ll); - DEBUG_DEBUG(DEBUG_CATEGORY_ETCP, "[%s] input -> inflight (seq=%u, len=%u)", etcp->log_name, p->seq, p->ll.len); + DEBUG_DEBUG(DEBUG_CATEGORY_ETCP, "[%s] input -> inflight (seq=%u, len=%u) Q in=%d snd=%d waid=%d", etcp->log_name, p->seq, p->ll.len, etcp->input_queue->count, etcp->input_send_q->count, etcp->input_wait_ack->count); int len=p->ll.len;// сохраним len // Add to send queue @@ -563,19 +563,17 @@ static void input_queue_cb(struct ll_queue* q, void* arg) { // DEBUG_DEBUG(DEBUG_CATEGORY_ETCP, "input_queue_cb: successfully moved from input_queue to input_send_q"); // etcp_conn_process_send_queue(etcp);// сразу обработаем этот пакет - DEBUG_DEBUG(DEBUG_CATEGORY_ETCP, "[%s] nextloop, input_queue size=%d ", etcp->log_name, q->count); + DEBUG_TRACE(DEBUG_CATEGORY_ETCP, "[%s] nextloop, input_queue size=%d ", etcp->log_name, q->count); } static void ack_timeout_cb(void* arg); static void ack_timeout_check(struct ETCP_CONN* etcp) { - DEBUG_TRACE(DEBUG_CATEGORY_ETCP, ""); - uint64_t now = get_time_tb(); int32_t timeout = (etcp->rtt_avg_10 * RETRANS_K1 + etcp->jitter * RETRANS_K2) / 16; if (timeout<50) timeout=50; if (timeout>10000) timeout=10000; - DEBUG_DEBUG(DEBUG_CATEGORY_ETCP, "starting check, now=%llu, timeout=%llu, rtt_avg_10=%u, jitter=%u", + DEBUG_TRACE(DEBUG_CATEGORY_ETCP, "starting check, now=%llu, timeout=%llu, rtt_avg_10=%u, jitter=%u", (unsigned long long)now, (unsigned long long)timeout, etcp->rtt_avg_10, etcp->jitter); @@ -609,7 +607,7 @@ static void ack_timeout_check(struct ETCP_CONN* etcp) { int64_t next_timeout=timeout - elapsed; if (next_timeout<0) next_timeout=0; etcp->retrans_timer = uasync_set_timeout(etcp->instance->ua, next_timeout+10, etcp, ack_timeout_cb); - DEBUG_DEBUG(DEBUG_CATEGORY_ETCP, "[%s] retransmission timer set for %llu units", etcp->log_name, next_timeout); + DEBUG_TRACE(DEBUG_CATEGORY_ETCP, "[%s] retransmission timer set for %llu units", etcp->log_name, next_timeout); return; } current = etcp->input_wait_ack->head; @@ -852,7 +850,8 @@ struct ETCP_DGRAM* etcp_request_pkt(struct ETCP_CONN* etcp) { if (inf_pkt) { // фрейм data (0) обязательно в конец - DEBUG_DEBUG(DEBUG_CATEGORY_ETCP, "[%s] Send DATA (seq=%u, len=%u), ack_size=%d send_count=%d", etcp->log_name, inf_pkt->seq, inf_pkt->ll.len, dgram->data[1], inf_pkt->send_count); + DEBUG_DEBUG(DEBUG_CATEGORY_ETCP, "[%s] Send DATA: seq=%u len=%u retry=%d; in=%d snd=%d waid=%d", etcp->log_name, inf_pkt->seq, inf_pkt->ll.len, inf_pkt->send_count, etcp->input_queue->count, etcp->input_send_q->count, etcp->input_wait_ack->count); + dgram->data[ptr++]=0;// payload dgram->data[ptr++]=inf_pkt->seq; dgram->data[ptr++]=inf_pkt->seq>>8;