chatgui: fix RTT display 10x overstatement (DB stores 0.1ms, displayed as ms); remove unused rtt_avg_100
This commit is contained in:
1 parent
12904a97e0
commit
11ab897fe5
12 files changed
+85
-23
No files matched your search
@@ -1064,7 +1064,6 @@ static void send_metrics(struct control_server* server, struct control_client* c
|
||||
rsp->etcp.peer_node_id = conn->peer_node_id;
|
||||
rsp->etcp.rtt_last = conn->rtt_last;
|
||||
rsp->etcp.rtt_avg_10 = conn->rtt_avg_10;
|
||||
rsp->etcp.rtt_avg_100 = conn->rtt_avg_100;
|
||||
rsp->etcp.jitter = conn->jitter;
|
||||
rsp->etcp.bytes_sent_total = conn->bytes_sent_total;
|
||||
rsp->etcp.retrans_count = conn->retransmissions_count;
|
||||
|
||||
@@ -240,7 +240,6 @@ struct ETCP_CONN* etcp_connection_create(struct UTUN_INSTANCE* instance, char* n
|
||||
etcp->mtu = ETCP_RFC791_MIN_MTU; // Default MTU per RFC 791
|
||||
etcp->next_tx_id = 1;
|
||||
etcp->rtt_avg_10 = 10; // Initial guess (1ms)
|
||||
etcp->rtt_avg_100 = 10;
|
||||
etcp->rtt_history_idx = 0;
|
||||
memset(etcp->rtt_history, 0, sizeof(etcp->rtt_history));
|
||||
|
||||
@@ -451,7 +450,6 @@ void etcp_conn_reset(struct ETCP_CONN* etcp) {
|
||||
etcp->unacked_bytes = 0;
|
||||
etcp->rtt_last = 0;
|
||||
etcp->rtt_avg_10 = 0;
|
||||
etcp->rtt_avg_100 = 0;
|
||||
etcp->jitter = 0;
|
||||
etcp->last_rtt_cb_time = 0;
|
||||
etcp->bytes_sent_total = 0;
|
||||
@@ -856,7 +854,6 @@ void etcp_stats(struct ETCP_CONN* etcp) {
|
||||
DEBUG_DEBUG(DEBUG_CATEGORY_ETCP, "[%s] RTT metrics:", etcp->log_name);
|
||||
DEBUG_DEBUG(DEBUG_CATEGORY_ETCP, "[%s] rtt_last: %u (0.1ms)", etcp->log_name, etcp->rtt_last);
|
||||
DEBUG_DEBUG(DEBUG_CATEGORY_ETCP, "[%s] rtt_avg_10: %u (0.1ms)", etcp->log_name, etcp->rtt_avg_10);
|
||||
DEBUG_DEBUG(DEBUG_CATEGORY_ETCP, "[%s] rtt_avg_100: %u (0.1ms)", etcp->log_name, etcp->rtt_avg_100);
|
||||
DEBUG_DEBUG(DEBUG_CATEGORY_ETCP, "[%s] jitter: %u (0.1ms)", etcp->log_name, etcp->jitter);
|
||||
|
||||
// Counters
|
||||
|
||||
@@ -197,7 +197,6 @@ struct ETCP_CONN {
|
||||
uint16_t tt_last;// transmission time (время пакета до меня)
|
||||
// uint16_t rxt_last;// recv relative time (бустро регаирует на изменение задержки rx и медленно на изменение задержки tx)
|
||||
uint16_t rtt_avg_10;
|
||||
uint16_t rtt_avg_100;
|
||||
uint16_t jitter;
|
||||
uint64_t last_rtt_cb_time; // время последнего вызова ping_update_rtt (0.1ms)
|
||||
uint32_t bytes_sent_total;
|
||||
|
||||
@@ -65,8 +65,8 @@ void etcp_dump_conn_state(struct ETCP_CONN* conn) {
|
||||
conn->next_tx_id, conn->last_rx_id, conn->last_delivered_id, conn->rx_ack_till);
|
||||
|
||||
/* --- RTT --- */
|
||||
DUMP_LINE("RTT: last=%u avg10=%u avg100=%u jitter=%u",
|
||||
conn->rtt_last, conn->rtt_avg_10, conn->rtt_avg_100, conn->jitter);
|
||||
DUMP_LINE("RTT: last=%u avg10=%u jitter=%u",
|
||||
conn->rtt_last, conn->rtt_avg_10, conn->jitter);
|
||||
|
||||
/* --- STATS --- */
|
||||
DUMP_LINE("STATS: bytes_sent=%u retrans=%u reinit=%u reset=%u ack_pkts=%u",
|
||||
|
||||
Reference in new issue
Block a user