From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by passt.top (Postfix) with ESMTPS id F32905A0271 for ; Wed, 16 Nov 2022 05:42:20 +0100 (CET) Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4NBr4R0ZGbz4xZ3; Wed, 16 Nov 2022 15:42:15 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=201602; t=1668573735; bh=KRl2Pvm+xJ8fkF8BTSUrKtDdACtup2xB6XWkQgAJC8Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ez07Y3JVKhRU2YN6HFtWGAqBGBJO0/pD2F1Dw+pjqYkAx/wJ7jox+rGZzc4t+YXd2 V0PmmZqyX8Sk1Ga9HNu+bAVUEHQ2kdJ48/x4/dlolhVIdMyhezl6BJ0sGdEp6I+uuS pNEXWOErU78A4evR4Sbg/Q9FqxFU/1BMteUMtv4M= From: David Gibson To: passt-dev@passt.top, Stefano Brivio Subject: [PATCH 03/32] tcp_splice: #include tcp_splice.h in tcp_splice.c Date: Wed, 16 Nov 2022 15:41:43 +1100 Message-Id: <20221116044212.3876516-4-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221116044212.3876516-1-david@gibson.dropbear.id.au> References: <20221116044212.3876516-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: 4AVXQ5GI5NFGSVIDN73TFNGVEEQDVYKV X-Message-ID-Hash: 4AVXQ5GI5NFGSVIDN73TFNGVEEQDVYKV X-MailFrom: dgibson@gandalf.ozlabs.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: David Gibson X-Mailman-Version: 3.3.3 Precedence: list List-Id: Development discussion and patches for passt Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: This obvious include was omitted, which means that declarations in the header weren't checked against definitions in the .c file. This shows up an old declaration for a function that is now static, and a duplicate #define. Signed-off-by: David Gibson --- tcp_splice.c | 2 +- tcp_splice.h | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/tcp_splice.c b/tcp_splice.c index 99c5fa7..3c5c111 100644 --- a/tcp_splice.c +++ b/tcp_splice.c @@ -49,9 +49,9 @@ #include "util.h" #include "passt.h" #include "log.h" +#include "tcp_splice.h" #define MAX_PIPE_SIZE (8UL * 1024 * 1024) -#define TCP_SPLICE_MAX_CONNS (128 * 1024) #define TCP_SPLICE_PIPE_POOL_SIZE 16 #define TCP_SPLICE_CONN_PRESSURE 30 /* % of splice_conn_count */ #define TCP_SPLICE_FILE_PRESSURE 30 /* % of c->nofile */ diff --git a/tcp_splice.h b/tcp_splice.h index 63ffc68..2c4bff3 100644 --- a/tcp_splice.h +++ b/tcp_splice.h @@ -8,11 +8,8 @@ #define TCP_SPLICE_MAX_CONNS (128 * 1024) -struct tcp_splice_conn; - void tcp_sock_handler_splice(struct ctx *c, union epoll_ref ref, uint32_t events); -void tcp_splice_destroy(struct ctx *c, struct tcp_splice_conn *conn); void tcp_splice_init(struct ctx *c); void tcp_splice_timer(struct ctx *c); void tcp_splice_defer_handler(struct ctx *c); -- 2.38.1