From: David Gibson <david@gibson.dropbear.id.au>
To: Stefano Brivio <sbrivio@redhat.com>
Cc: passt-dev@passt.top, Yalan Zhang <yalzhang@redhat.com>
Subject: Re: [PATCH v3 5/8] log: Add _perror() logging function variants
Date: Thu, 20 Jun 2024 10:45:17 +1000 [thread overview]
Message-ID: <ZnN7nVwaBivpkJpO@zatzit> (raw)
In-Reply-To: <20240619194028.2913930-6-sbrivio@redhat.com>
[-- Attachment #1: Type: text/plain, Size: 3416 bytes --]
On Wed, Jun 19, 2024 at 09:40:25PM +0200, Stefano Brivio wrote:
> In many places, we have direct perror() calls, which completely bypass
> logging functions and log files.
>
> They are definitely convenient: offer similar convenience with
> _perror() logging variants, so that we can drop those direct perror()
> calls.
>
> Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
> ---
> log.c | 22 ++++++++++++++++++++++
> log.h | 21 +++++++++++++++++----
> 2 files changed, 39 insertions(+), 4 deletions(-)
>
> diff --git a/log.c b/log.c
> index 7018bda..43117c1 100644
> --- a/log.c
> +++ b/log.c
> @@ -78,6 +78,11 @@ void vlogmsg(int pri, const char *format, va_list ap)
> }
> }
>
> +/**
> + * logmsg() - vlogmsg() wrapper for variable argument lists
> + * @pri: Facility and level map, same as priority for vsyslog()
> + * @format: Message
> + */
> void logmsg(int pri, const char *format, ...)
> {
> va_list ap;
> @@ -87,6 +92,23 @@ void logmsg(int pri, const char *format, ...)
> va_end(ap);
> }
>
> +/**
> + * logmsg_perror() - vlogmsg() wrapper with perror()-like functionality
> + * @pri: Facility and level map, same as priority for vsyslog()
> + * @format: Message
> + */
> +void logmsg_perror(int pri, const char *format, ...)
> +{
> + int errno_copy = errno;
> + va_list ap;
> +
> + va_start(ap, format);
> + vlogmsg(pri, format, ap);
> + va_end(ap);
> +
> + logmsg(pri, ": %s", strerror(errno_copy));
> +}
> +
> /* Prefixes for log file messages, indexed by priority */
> const char *logfile_prefix[] = {
> NULL, NULL, NULL, /* Unused: LOG_EMERG, LOG_ALERT, LOG_CRIT */
> diff --git a/log.h b/log.h
> index 1d6dd1d..bdeffde 100644
> --- a/log.h
> +++ b/log.h
> @@ -16,11 +16,18 @@
> void vlogmsg(int pri, const char *format, va_list ap);
> void logmsg(int pri, const char *format, ...)
> __attribute__((format(printf, 2, 3)));
> +void logmsg_perror(int pri, const char *format, ...)
> + __attribute__((format(printf, 2, 3)));
> +
> +#define err(...) logmsg( LOG_ERR, __VA_ARGS__)
> +#define warn(...) logmsg( LOG_WARNING, __VA_ARGS__)
> +#define info(...) logmsg( LOG_INFO, __VA_ARGS__)
> +#define debug(...) logmsg( LOG_DEBUG, __VA_ARGS__)
>
> -#define err(...) logmsg(LOG_ERR, __VA_ARGS__)
> -#define warn(...) logmsg(LOG_WARNING, __VA_ARGS__)
> -#define info(...) logmsg(LOG_INFO, __VA_ARGS__)
> -#define debug(...) logmsg(LOG_DEBUG, __VA_ARGS__)
> +#define err_perror(...) logmsg_perror( LOG_ERR, __VA_ARGS__)
> +#define warn_perror(...) logmsg_perror( LOG_WARNING, __VA_ARGS__)
> +#define info_perror(...) logmsg_perror( LOG_INFO, __VA_ARGS__)
> +#define debug_perror(...) logmsg_perror( LOG_DEBUG, __VA_ARGS__)
>
> #define die(...) \
> do { \
> @@ -28,6 +35,12 @@ void logmsg(int pri, const char *format, ...)
> exit(EXIT_FAILURE); \
> } while (0)
>
> +#define die_perror(...) \
> + do { \
> + err_perror(__VA_ARGS__); \
> + exit(EXIT_FAILURE); \
> + } while (0)
> +
> extern int log_trace;
> extern bool log_conf_parsed;
> extern bool log_daemon_ready;
--
David Gibson (he or they) | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you, not the other way
| around.
http://www.ozlabs.org/~dgibson
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2024-06-20 0:49 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-19 19:40 [PATCH v3 0/8] Fixes for early logging/prints and related cleanups Stefano Brivio
2024-06-19 19:40 ` [PATCH v3 1/8] conf, passt: Don't try to log to stderr after we close it Stefano Brivio
2024-06-20 0:27 ` David Gibson
2024-06-19 19:40 ` [PATCH v3 2/8] conf, passt: Make --stderr do nothing, and deprecate it Stefano Brivio
2024-06-20 0:31 ` David Gibson
2024-06-19 19:40 ` [PATCH v3 3/8] conf, log: Instead of abusing log levels, add log_conf_parsed flag Stefano Brivio
2024-06-20 0:33 ` David Gibson
2024-06-19 19:40 ` [PATCH v3 4/8] log, passt: Always print to stderr before initialisation is complete Stefano Brivio
2024-06-20 0:44 ` David Gibson
2024-06-19 19:40 ` [PATCH v3 5/8] log: Add _perror() logging function variants Stefano Brivio
2024-06-20 0:45 ` David Gibson [this message]
2024-06-19 19:40 ` [PATCH v3 6/8] treewide: Replace perror() calls with calls to logging functions Stefano Brivio
2024-06-20 0:47 ` David Gibson
2024-06-19 19:40 ` [PATCH v3 7/8] treewide: Replace strerror() calls Stefano Brivio
2024-06-20 0:48 ` David Gibson
2024-06-19 19:40 ` [PATCH v3 8/8] conf, passt: Don't call __openlog() if a log file is used Stefano Brivio
2024-06-20 0:49 ` David Gibson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ZnN7nVwaBivpkJpO@zatzit \
--to=david@gibson.dropbear.id.au \
--cc=passt-dev@passt.top \
--cc=sbrivio@redhat.com \
--cc=yalzhang@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://passt.top/passt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for IMAP folder(s).