CLEANUP: quic: Remove window redundant variable from NewReno algorithm state struct
We use the window variable which is stored in the path struct.
diff --git a/include/haproxy/quic_cc-t.h b/include/haproxy/quic_cc-t.h
index 95d9922..5c50a6c 100644
--- a/include/haproxy/quic_cc-t.h
+++ b/include/haproxy/quic_cc-t.h
@@ -73,7 +73,6 @@
/* NewReno */
struct nr {
enum quic_cc_algo_state_type state;
- uint64_t cwnd;
uint64_t ssthresh;
uint64_t recovery_start_time;
uint64_t remain_acked;
diff --git a/src/quic_cc_newreno.c b/src/quic_cc_newreno.c
index 3952910..97a0c82 100644
--- a/src/quic_cc_newreno.c
+++ b/src/quic_cc_newreno.c
@@ -28,11 +28,7 @@
static int quic_cc_nr_init(struct quic_cc *cc)
{
- struct quic_path *path;
-
- path = container_of(cc, struct quic_path, cc);
cc->algo_state.nr.state = QUIC_CC_ST_SS;
- cc->algo_state.nr.cwnd = path->cwnd;
cc->algo_state.nr.ssthresh = QUIC_CC_INFINITE_SSTHESH;
cc->algo_state.nr.recovery_start_time = 0;
cc->algo_state.nr.remain_acked = 0;
@@ -46,7 +42,7 @@
struct quic_path *path;
path = container_of(cc, struct quic_path, cc);
- cc->algo_state.nr.cwnd = path->min_cwnd;
+ path->cwnd = path->min_cwnd;
/* Re-entering slow start state. */
cc->algo_state.nr.state = QUIC_CC_ST_SS;
/* Recovery start time reset */
@@ -66,16 +62,15 @@
if (ev->ack.time_sent <= cc->algo_state.nr.recovery_start_time)
return;
- cc->algo_state.nr.cwnd += ev->ack.acked;
+ path->cwnd += ev->ack.acked;
/* Exit to congestion avoidance if slow start threshold is reached. */
- if (cc->algo_state.nr.cwnd > cc->algo_state.nr.ssthresh)
+ if (path->cwnd > cc->algo_state.nr.ssthresh)
cc->algo_state.nr.state = QUIC_CC_ST_CA;
- path->cwnd = cc->algo_state.nr.cwnd;
break;
case QUIC_CC_EVT_LOSS:
- cc->algo_state.nr.cwnd = QUIC_MAX(cc->algo_state.nr.cwnd >> 1, path->min_cwnd);
- path->cwnd = cc->algo_state.nr.ssthresh = cc->algo_state.nr.cwnd;
+ path->cwnd = QUIC_MAX(path->cwnd >> 1, path->min_cwnd);
+ cc->algo_state.nr.ssthresh = path->cwnd;
/* Exit to congestion avoidance. */
cc->algo_state.nr.state = QUIC_CC_ST_CA;
break;
@@ -105,9 +100,8 @@
/* Increasing the congestion window by (acked / cwnd)
*/
acked = ev->ack.acked * path->mtu + cc->algo_state.nr.remain_acked;
- cc->algo_state.nr.remain_acked = acked % cc->algo_state.nr.cwnd;
- cc->algo_state.nr.cwnd += acked / cc->algo_state.nr.cwnd;
- path->cwnd = cc->algo_state.nr.cwnd;
+ cc->algo_state.nr.remain_acked = acked % path->cwnd;
+ path->cwnd += acked / path->cwnd;
break;
}
@@ -117,9 +111,8 @@
goto out;
cc->algo_state.nr.recovery_start_time = now_ms;
- cc->algo_state.nr.ssthresh = cc->algo_state.nr.cwnd;
- cc->algo_state.nr.cwnd = QUIC_MAX(cc->algo_state.nr.cwnd >> 1, path->min_cwnd);
- path->cwnd = cc->algo_state.nr.cwnd;
+ cc->algo_state.nr.ssthresh = path->cwnd;
+ path->cwnd = QUIC_MAX(path->cwnd >> 1, path->min_cwnd);
break;
case QUIC_CC_EVT_ECN_CE:
@@ -133,9 +126,12 @@
static void quic_cc_nr_state_trace(struct buffer *buf, const struct quic_cc *cc)
{
+ struct quic_path *path;
+
+ path = container_of(cc, struct quic_path, cc);
chunk_appendf(buf, " state=%s cwnd=%llu ssthresh=%ld recovery_start_time=%llu",
quic_cc_state_str(cc->algo_state.nr.state),
- (unsigned long long)cc->algo_state.nr.cwnd,
+ (unsigned long long)path->cwnd,
(long)cc->algo_state.nr.ssthresh,
(unsigned long long)cc->algo_state.nr.recovery_start_time);
}