From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by passt.top (Postfix) with ESMTPS id B27545A0272 for ; Thu, 21 Dec 2023 07:16:00 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=202312; t=1703139352; bh=YUtmw7g+W367TukH5ia3LZ3o4b/SlzxZZqFpQXVHbr0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hv8mSbzWqv3hQr9RXj6+rFvr9buZ5DQnHm5Lrky8zjUxuocKkMzNOp93RvI3AJBcH qE70M8av+JTdP2sX/XXSRvE1EASPm2RG0C3iv+DHl58dVg6L4Y/lxdXhx6psXJ8wNQ X50981263OInGbxD+5lTCcoUPjsljUF1hiwhVt4TOzvndB1VvbL/OhRddE8EI1Sd+R N/dSj90UHjHldN4UFIGwVeBj2RA+ARw/rFqAopCyq/AqmPn5pEgmokzcZCvV4C/1FX DVqPE1t1TsH8Ay8Kuqs7pcc/3WkagTBQLpDQ+j3uvoWZtpZ5+ldysuiKC4dSy1M3v9 lfHutSLxTCrRA== Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4SwgCr4NW9z4xQj; Thu, 21 Dec 2023 17:15:52 +1100 (AEDT) From: David Gibson To: passt-dev@passt.top, Stefano Brivio Subject: [PATCH v3 09/13] flow: Move flow_log_() to near top of flow.c Date: Thu, 21 Dec 2023 17:15:45 +1100 Message-ID: <20231221061549.976358-10-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231221061549.976358-1-david@gibson.dropbear.id.au> References: <20231221061549.976358-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: QBFDC2QUEZ7EE276JS26CEMH7S4C7U5E X-Message-ID-Hash: QBFDC2QUEZ7EE276JS26CEMH7S4C7U5E 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