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 5BFFE5A0285 for ; Wed, 20 Dec 2023 08:09:24 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=202312; t=1703056152; bh=YUtmw7g+W367TukH5ia3LZ3o4b/SlzxZZqFpQXVHbr0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DPUh7AnYoECw4sQhfNTId2w4SchqxjF2ptqY4Dr5akMOUEvZT1pZv3qfKTpXGpKhu rj4wuMtAaK+aZPAtqHPNIhHmpGw11MnsEUYSTrfNw5mgUx8O/1NDNOsLeeaeUHP2Zf 3RvG1yhGbQhQSLthVDrjZF5tDHYHtOF1kCkaIq+Z6Oyyfx/KgZPCZN8jpQWA7966/E kphz5SgitXLRAnOMGR7pj8dXkgVdRrilzJt9P5wEBCZOhvHd0Gx8Gy/8UiBMm3H+39 F/m+icRVYj5oLAhFSV2XP5vx1OzwT/jT+uu8Uu9UpvlPICPrpvMW1Law2NXyqakBCI IqMlAVFnQ6Rgg== Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4Sw4Rr2fjLz4xGl; Wed, 20 Dec 2023 18:09:12 +1100 (AEDT) From: David Gibson To: passt-dev@passt.top, Stefano Brivio Subject: [PATCH v2 09/13] flow: Move flow_log_() to near top of flow.c Date: Wed, 20 Dec 2023 18:09:04 +1100 Message-ID: <20231220070908.2506277-10-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231220070908.2506277-1-david@gibson.dropbear.id.au> References: <20231220070908.2506277-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: BNOMFWDS3WEF6MVUAJQT2FAJGWHU7IID X-Message-ID-Hash: BNOMFWDS3WEF6MVUAJQT2FAJGWHU7IID 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.8 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: flow_log_() is a very basic widely used function that many other functions in flow.c will end up needing. At present it's below flow_table_compact() which happens not to need it, but that's likely to change. Move it to near the top of flow.c to avoid forward declarations. Code motion only, no changes. Signed-off-by: David Gibson --- flow.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flow.c b/flow.c index ef129db..79c6ae6 100644 --- a/flow.c +++ b/flow.c @@ -30,6 +30,24 @@ union flow flowtab[FLOW_MAX]; /* Last time the flow timers ran */ static struct timespec flow_timer_run; +/** flow_log_ - Log flow-related message + * @f: flow the message is related to + * @pri: Log priority + * @fmt: Format string + * @...: printf-arguments + */ +void flow_log_(const struct flow_common *f, int pri, const char *fmt, ...) +{ + char msg[BUFSIZ]; + va_list args; + + va_start(args, fmt); + (void)vsnprintf(msg, sizeof(msg), fmt, args); + va_end(args); + + logmsg(pri, "Flow %u (%s): %s", flow_idx(f), FLOW_TYPE(f), msg); +} + /** * flow_table_compact() - Perform compaction on flow table * @c: Execution context @@ -69,24 +87,6 @@ void flow_table_compact(struct ctx *c, union flow *hole) memset(from, 0, sizeof(*from)); } -/** flow_log_ - Log flow-related message - * @f: flow the message is related to - * @pri: Log priority - * @fmt: Format string - * @...: printf-arguments - */ -void flow_log_(const struct flow_common *f, int pri, const char *fmt, ...) -{ - char msg[BUFSIZ]; - va_list args; - - va_start(args, fmt); - (void)vsnprintf(msg, sizeof(msg), fmt, args); - va_end(args); - - logmsg(pri, "Flow %u (%s): %s", flow_idx(f), FLOW_TYPE(f), msg); -} - /** * flow_defer_handler() - Handler for per-flow deferred and timed tasks * @c: Execution context -- 2.43.0