mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-11-29 06:40:59 +01:00
Code Issues Projects Releases Wiki Activity

CLEANUP: quic: Remove useless definitions from quic_cc_event struct

Browse Source 
Since the persistent congestion detection is done out of the congestion
controllers, there is no need to pass them information through quic_cc_event struct.
We remove its useless members. Also remove qc_cc_loss_event() which is no more used.
This commit is contained in:
Frédéric Lécaille 2022-03-02 15:33:06 +01:00 committed by Amaury Denoyelle
parent a5ee0ae6a2
commit 5f6783094d
3 changed files with 1 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/haproxy/quic_cc-t.h
View File

@ -60,11 +60,7 @@ struct quic_cc_event {
unsigned int time_sent; unsigned int time_sent;
} ack; } ack;
struct loss { struct loss {
unsigned int now_ms;
unsigned int max_ack_delay;
size_t lost_bytes;
unsigned int time_sent; unsigned int time_sent;
unsigned int period;
} loss; } loss;
}; };
}; };

6
include/haproxy/quic_cc.h
View File

@ -57,11 +57,7 @@ static inline void quic_cc_event_trace(struct buffer *buf, const struct quic_cc_
(unsigned long long)ev->ack.acked, ev->ack.time_sent); (unsigned long long)ev->ack.acked, ev->ack.time_sent);
break; break;
case QUIC_CC_EVT_LOSS: case QUIC_CC_EVT_LOSS:
chunk_appendf(buf, "loss now_ms=%u max_ack_delay=%u lost_bytes=%llu" chunk_appendf(buf, "now_ms=%u time_sent=%u", now_ms, ev->loss.time_sent);
" time_sent=%u period=%u",
ev->loss.now_ms, ev->loss.max_ack_delay,
(unsigned long long)ev->loss.lost_bytes,
ev->loss.time_sent, ev->loss.period);
break; break;
case QUIC_CC_EVT_ECN_CE: case QUIC_CC_EVT_ECN_CE:
chunk_appendf(buf, "ecn_ce"); chunk_appendf(buf, "ecn_ce");

24
src/xprt_quic.c
View File

@ -1558,30 +1558,6 @@ static inline void free_quic_tx_pkts(struct list *pkts)
} }
} }
/* Send a packet loss event nofification to the congestion controller
* attached to <qc> connection with <lost_bytes> the number of lost bytes,
* <oldest_lost>, <newest_lost> the oldest lost packet and newest lost packet
* at <now_us> current time.
* Always succeeds.
*/
static inline void qc_cc_loss_event(struct quic_conn *qc,
unsigned int lost_bytes,
unsigned int newest_time_sent,
unsigned int period,
unsigned int now_us)
{
struct quic_cc_event ev = {
.type = QUIC_CC_EVT_LOSS,
.loss.now_ms = now_ms,
.loss.max_ack_delay = qc->max_ack_delay,
.loss.lost_bytes = lost_bytes,
.loss.time_sent = newest_time_sent,
.loss.period = period,
};
quic_cc_event(&qc->path->cc, &ev);
}
/* Send a packet ack event nofication for each newly acked packet of /* Send a packet ack event nofication for each newly acked packet of
* <newly_acked_pkts> list and free them. * <newly_acked_pkts> list and free them.
* Always succeeds. * Always succeeds.