From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by passt.top (Postfix, from userid 1000) id C0F135A0055; Thu, 20 Jun 2024 06:08:00 +0200 (CEST) From: Stefano Brivio To: passt-dev@passt.top Subject: [PATCH v4 5/8] log: Add _perror() logging function variants Date: Thu, 20 Jun 2024 06:07:57 +0200 Message-ID: <20240620040800.3065684-6-sbrivio@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240620040800.3065684-1-sbrivio@redhat.com> References: <20240620040800.3065684-1-sbrivio@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: U7GEBAILUZ4N5VM2X4VHTYFWZGTRJHQI X-Message-ID-Hash: U7GEBAILUZ4N5VM2X4VHTYFWZGTRJHQI X-MailFrom: sbrivio@passt.top 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: Yalan Zhang , 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: 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 Reviewed-by: David Gibson --- log.c | 22 ++++++++++++++++++++++ log.h | 21 +++++++++++++++++---- 2 files changed, 39 insertions(+), 4 deletions(-) diff --git a/log.c b/log.c index 025129a..a352b06 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 7bfd92d..d46bbaa 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_daemonised; -- 2.43.0