From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server-vie001.gnuweeb.org X-Spam-Level: X-Spam-Status: No, score=-1.2 required=5.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_DBL_BLOCKED_OPENDNS, URIBL_ZEN_BLOCKED_OPENDNS autolearn=ham autolearn_force=no version=3.4.6 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gnuweeb.org; s=new2025; t=1753760853; bh=+P02fW7is5LZ8joHZqEe3OOmlHgj3wAg4IU2w+Mgz9Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Transfer-Encoding:Message-ID:Date:From: Reply-To:Subject:To:Cc:In-Reply-To:References:Resent-Date: Resent-From:Resent-To:Resent-Cc:User-Agent:Content-Type: Content-Transfer-Encoding; b=q0EkahXR47Igd9ZQxw+lOn4cdFiYCSNwRHBvfVlk843q93cf9Q/sF55pTNva9BJOV Tt+fT+7UNtCEGXqUQbCNzwbVcdX/nYunfkP3x2b8vRX2Um9Q+dUHkaDjBvBdwlFd1d Ge/s6ka1+FepZrVQLuQm99s3FsEVuce7xtwYAoo8TGFT9O9sP6MvoazlQbuPlhBp3x UCPKDFcekho8WYqsHsOT4SRHIUDeokcBqfmKKACP83wjJKNtrhcXu/rCdFGqU7nP2G cxKw7A+PbtENuU5T+6CIHpXbwP3DhIKcWEM7QjIvPzOSCATQjvikSOz2xSTmnKNzkC yBazlm3cGhQaQ== Received: from zero (unknown [182.253.228.104]) by server-vie001.gnuweeb.org (Postfix) with ESMTPSA id 086D43126ECB; Tue, 29 Jul 2025 03:47:32 +0000 (UTC) From: Ahmad Gani To: ammarfaizi2@gnuweeb.org Cc: gwml@vger.gnuweeb.org, reyuki@gnuweeb.org Subject: [PATCH gwproxy v2 3/3] io_uring: Rename GWP_CONN_FLAG_IS_SHUTDOWN to GWP_CONN_FLAG_IS_CANCEL Date: Tue, 29 Jul 2025 10:47:19 +0700 Message-ID: <20250729034719.190563-4-reyuki@gnuweeb.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250729034719.190563-1-reyuki@gnuweeb.org> References: <20250729034719.190563-1-reyuki@gnuweeb.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: A previous commit forgot to replace GWP_CONN_FLAG_IS_SHUTDOWN and leading to build error on debug mode, it wasn't detected on release mode. Fixes: 06fa2ea2ba4a ("io_uring: Replace prep_shutdown() with prep_cancel()") Signed-off-by: Ahmad Gani --- src/gwproxy/ev/io_uring.c | 8 ++++---- src/gwproxy/gwproxy.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/gwproxy/ev/io_uring.c b/src/gwproxy/ev/io_uring.c index e7696efbf4aa..ca7178476f9f 100644 --- a/src/gwproxy/ev/io_uring.c +++ b/src/gwproxy/ev/io_uring.c @@ -318,7 +318,7 @@ static void shutdown_gcp(struct gwp_wrk *w, struct gwp_conn_pair *gcp) struct gwp_ctx *ctx = w->ctx; struct io_uring_sqe *s; - if (gcp->flags & GWP_CONN_FLAG_IS_SHUTDOWN) + if (gcp->flags & GWP_CONN_FLAG_IS_CANCEL) return; if (gcp->target.fd >= 0) { @@ -339,7 +339,7 @@ static void shutdown_gcp(struct gwp_wrk *w, struct gwp_conn_pair *gcp) get_gcp(gcp); } - gcp->flags |= GWP_CONN_FLAG_IS_SHUTDOWN; + gcp->flags |= GWP_CONN_FLAG_IS_CANCEL; } static int arm_gcp(struct gwp_wrk *w, struct gwp_conn_pair *gcp) @@ -640,7 +640,7 @@ static int handle_event(struct gwp_wrk *w, struct io_uring_cqe *cqe) break; case EV_BIT_TARGET_CANCEL: pr_dbg(&ctx->lh, "Handling target cancel event: %d", cqe->res); - assert(gcp->flags & GWP_CONN_FLAG_IS_SHUTDOWN); + assert(gcp->flags & GWP_CONN_FLAG_IS_CANCEL); r = 0; break; case EV_BIT_CLIENT_CANCEL: @@ -661,7 +661,7 @@ static int handle_event(struct gwp_wrk *w, struct io_uring_cqe *cqe) gcp = udata; if ((gcp->flags & GWP_CONN_FLAG_IS_DYING) && - !(gcp->flags & GWP_CONN_FLAG_IS_SHUTDOWN)) + !(gcp->flags & GWP_CONN_FLAG_IS_CANCEL)) shutdown_gcp(w, gcp); put_gcp(w, gcp); diff --git a/src/gwproxy/gwproxy.h b/src/gwproxy/gwproxy.h index 86c1a05458ad..4b0fdfb37f73 100644 --- a/src/gwproxy/gwproxy.h +++ b/src/gwproxy/gwproxy.h @@ -99,7 +99,7 @@ enum { */ GWP_CONN_FLAG_NO_CLOSE_FD = (1ull << 0ull), GWP_CONN_FLAG_IS_DYING = (1ull << 1ull), - GWP_CONN_FLAG_IS_SHUTDOWN = (1ull << 2ull), + GWP_CONN_FLAG_IS_CANCEL = (1ull << 2ull), }; struct gwp_conn_pair { -- Ahmad Gani