From 34476511f724d52ef4d944627ee741e33c1ba3d7 Mon Sep 17 00:00:00 2001 From: David Gibson Date: Thu, 17 Nov 2022 16:58:48 +1100 Subject: tcp: Partially unify tcp_timer() and tcp_splice_timer() 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 Signed-off-by: Stefano Brivio --- tcp.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'tcp.c') diff --git a/tcp.c b/tcp.c index a9cc811..24cd10b 100644 --- a/tcp.c +++ b/tcp.c @@ -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); } } -- cgit v1.2.3