mirrors/passt
1
0
Fork 0
mirror of https://passt.top/passt synced 2025-06-15 11:55:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

tcp: Partially unify tcp_timer() and tcp_splice_timer()

Browse source 
These two functions scan all the non-splced and spliced connections
respectively and perform timed updates on them.  Avoid scanning the now
unified table twice, by having tcp_timer scan it once calling the
relevant per-connection function for each one.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
This commit is contained in:
David Gibson 2022-11-17 16:58:48 +11:00 • committed by Stefano Brivio
parent 0eef48c4be
commit 34476511f7
4 changed files with 41 additions and 46 deletions

18
tcp.c
View file

@ -3283,8 +3283,6 @@ int tcp_init(struct ctx *c)
refill_arg.ns = 1;
NS_CALL(tcp_sock_refill, &refill_arg);
tcp_splice_timer(c);
}
return 0;
@ -3416,7 +3414,7 @@ static int tcp_port_rebind(void *arg)
void tcp_timer(struct ctx *c, const struct timespec *ts)
{
struct tcp_sock_refill_arg refill_arg = { c, 0 };
struct tcp_tap_conn *conn;
union tcp_conn *conn;
(void)ts;
@ -3439,11 +3437,13 @@ void tcp_timer(struct ctx *c, const struct timespec *ts)
}
}
for (conn = CONN(c->tcp.conn_count - 1); conn >= CONN(0); conn--) {
if (conn->c.spliced)
continue;
if (conn->events == CLOSED)
tcp_conn_destroy(c, conn);
for (conn = tc + c->tcp.conn_count - 1; conn >= tc; conn--) {
if (conn->c.spliced) {
tcp_splice_timer(c, &conn->splice);
} else {
if (conn->tap.events == CLOSED)
tcp_conn_destroy(c, &conn->tap);
}
}
tcp_sock_refill(&refill_arg);
@ -3453,6 +3453,6 @@ void tcp_timer(struct ctx *c, const struct timespec *ts)
(c->ifi6 && ns_sock_pool6[TCP_SOCK_POOL_TSH] < 0))
NS_CALL(tcp_sock_refill, &refill_arg);
tcp_splice_timer(c);
tcp_splice_pipe_refill(c);
}
}