* [PATCH] log: Don't define logging function 4 times
@ 2023-10-12 5:09 David Gibson
2023-10-13 5:17 ` David Gibson
0 siblings, 1 reply; 2+ messages in thread
From: David Gibson @ 2023-10-12 5:09 UTC (permalink / raw)
To: Stefano Brivio, passt-dev; +Cc: David Gibson
In log.c we use a macro to define logging functions for each of 4 priority
levels. The only difference between these is the priority we pass to
vsyslog() and similar functions. Because it's done as a macro, however,
the entire functions code is included in the binary 4 times.
Rearrange this to take the priority level as a parameter to a regular
function, then just use macros to define trivial wrappers which pass the
priority level.
This saves about 600 bytes of text in the executable (x86, non-AVX2).
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
log.c | 65 +++++++++++++++++++++++++++--------------------------------
log.h | 12 +++++++----
2 files changed, 38 insertions(+), 39 deletions(-)
diff --git a/log.c b/log.c
index c57bc8d..fd33f64 100644
--- a/log.c
+++ b/log.c
@@ -47,36 +47,36 @@ int log_to_stdout; /* Print to stdout instead of stderr */
#define BEFORE_DAEMON (setlogmask(0) == LOG_MASK(LOG_EMERG))
-#define logfn(name, level) \
-void name(const char *format, ...) { \
- FILE *out = log_to_stdout ? stdout : stderr; \
- struct timespec tp; \
- va_list args; \
- \
- if (setlogmask(0) & LOG_MASK(LOG_DEBUG) && log_file == -1) { \
- clock_gettime(CLOCK_REALTIME, &tp); \
- fprintf(out, "%lli.%04lli: ", \
- (long long int)tp.tv_sec - log_start, \
- (long long int)tp.tv_nsec / (100L * 1000)); \
- } \
- \
- if ((LOG_MASK(LOG_PRI(level)) & log_mask) || BEFORE_DAEMON) { \
- va_start(args, format); \
- if (log_file != -1) \
- logfile_write(level, format, args); \
- else if (!(setlogmask(0) & LOG_MASK(LOG_DEBUG))) \
- passt_vsyslog(level, format, args); \
- va_end(args); \
- } \
- \
- if ((setlogmask(0) & LOG_MASK(LOG_DEBUG) && log_file == -1) || \
- (BEFORE_DAEMON && !(log_opt & LOG_PERROR))) { \
- va_start(args, format); \
- (void)vfprintf(out, format, args); \
- va_end(args); \
- if (format[strlen(format)] != '\n') \
- fprintf(out, "\n"); \
- } \
+void logmsg(int pri, const char *format, ...)
+{
+ FILE *out = log_to_stdout ? stdout : stderr;
+ struct timespec tp;
+ va_list args;
+
+ if (setlogmask(0) & LOG_MASK(LOG_DEBUG) && log_file == -1) {
+ clock_gettime(CLOCK_REALTIME, &tp);
+ fprintf(out, "%lli.%04lli: ",
+ (long long int)tp.tv_sec - log_start,
+ (long long int)tp.tv_nsec / (100L * 1000));
+ }
+
+ if ((LOG_MASK(LOG_PRI(pri)) & log_mask) || BEFORE_DAEMON) {
+ va_start(args, format);
+ if (log_file != -1)
+ logfile_write(pri, format, args);
+ else if (!(setlogmask(0) & LOG_MASK(LOG_DEBUG)))
+ passt_vsyslog(pri, format, args);
+ va_end(args);
+ }
+
+ if ((setlogmask(0) & LOG_MASK(LOG_DEBUG) && log_file == -1) ||
+ (BEFORE_DAEMON && !(log_opt & LOG_PERROR))) {
+ va_start(args, format);
+ (void)vfprintf(out, format, args);
+ va_end(args);
+ if (format[strlen(format)] != '\n')
+ fprintf(out, "\n");
+ }
}
/* Prefixes for log file messages, indexed by priority */
@@ -89,11 +89,6 @@ const char *logfile_prefix[] = {
" ", /* LOG_DEBUG */
};
-logfn(err, LOG_ERR)
-logfn(warn, LOG_WARNING)
-logfn(info, LOG_INFO)
-logfn(debug,LOG_DEBUG)
-
/**
* trace_init() - Set log_trace depending on trace (debug) mode
* @enable: Tracing debug mode enabled if non-zero
diff --git a/log.h b/log.h
index a17171a..b4fb7e9 100644
--- a/log.h
+++ b/log.h
@@ -6,14 +6,18 @@
#ifndef LOG_H
#define LOG_H
+#include <syslog.h>
+
#define LOGFILE_SIZE_DEFAULT (1024 * 1024UL)
#define LOGFILE_CUT_RATIO 30 /* When full, cut ~30% size */
#define LOGFILE_SIZE_MIN (5UL * MAX(BUFSIZ, PAGE_SIZE))
-void err(const char *format, ...);
-void warn(const char *format, ...);
-void info(const char *format, ...);
-void debug(const char *format, ...);
+void logmsg(int pri, const char *format, ...);
+
+#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 die(...) \
do { \
--
@@ -6,14 +6,18 @@
#ifndef LOG_H
#define LOG_H
+#include <syslog.h>
+
#define LOGFILE_SIZE_DEFAULT (1024 * 1024UL)
#define LOGFILE_CUT_RATIO 30 /* When full, cut ~30% size */
#define LOGFILE_SIZE_MIN (5UL * MAX(BUFSIZ, PAGE_SIZE))
-void err(const char *format, ...);
-void warn(const char *format, ...);
-void info(const char *format, ...);
-void debug(const char *format, ...);
+void logmsg(int pri, const char *format, ...);
+
+#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 die(...) \
do { \
--
2.41.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] log: Don't define logging function 4 times
2023-10-12 5:09 [PATCH] log: Don't define logging function 4 times David Gibson
@ 2023-10-13 5:17 ` David Gibson
0 siblings, 0 replies; 2+ messages in thread
From: David Gibson @ 2023-10-13 5:17 UTC (permalink / raw)
To: Stefano Brivio, passt-dev
[-- Attachment #1: Type: text/plain, Size: 4774 bytes --]
On Thu, Oct 12, 2023 at 04:09:06PM +1100, David Gibson wrote:
> In log.c we use a macro to define logging functions for each of 4 priority
> levels. The only difference between these is the priority we pass to
> vsyslog() and similar functions. Because it's done as a macro, however,
> the entire functions code is included in the binary 4 times.
>
> Rearrange this to take the priority level as a parameter to a regular
> function, then just use macros to define trivial wrappers which pass the
> priority level.
>
> This saves about 600 bytes of text in the executable (x86, non-AVX2).
>
> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Superseded by a new series with a couple of extra patches.
> ---
> log.c | 65 +++++++++++++++++++++++++++--------------------------------
> log.h | 12 +++++++----
> 2 files changed, 38 insertions(+), 39 deletions(-)
>
> diff --git a/log.c b/log.c
> index c57bc8d..fd33f64 100644
> --- a/log.c
> +++ b/log.c
> @@ -47,36 +47,36 @@ int log_to_stdout; /* Print to stdout instead of stderr */
>
> #define BEFORE_DAEMON (setlogmask(0) == LOG_MASK(LOG_EMERG))
>
> -#define logfn(name, level) \
> -void name(const char *format, ...) { \
> - FILE *out = log_to_stdout ? stdout : stderr; \
> - struct timespec tp; \
> - va_list args; \
> - \
> - if (setlogmask(0) & LOG_MASK(LOG_DEBUG) && log_file == -1) { \
> - clock_gettime(CLOCK_REALTIME, &tp); \
> - fprintf(out, "%lli.%04lli: ", \
> - (long long int)tp.tv_sec - log_start, \
> - (long long int)tp.tv_nsec / (100L * 1000)); \
> - } \
> - \
> - if ((LOG_MASK(LOG_PRI(level)) & log_mask) || BEFORE_DAEMON) { \
> - va_start(args, format); \
> - if (log_file != -1) \
> - logfile_write(level, format, args); \
> - else if (!(setlogmask(0) & LOG_MASK(LOG_DEBUG))) \
> - passt_vsyslog(level, format, args); \
> - va_end(args); \
> - } \
> - \
> - if ((setlogmask(0) & LOG_MASK(LOG_DEBUG) && log_file == -1) || \
> - (BEFORE_DAEMON && !(log_opt & LOG_PERROR))) { \
> - va_start(args, format); \
> - (void)vfprintf(out, format, args); \
> - va_end(args); \
> - if (format[strlen(format)] != '\n') \
> - fprintf(out, "\n"); \
> - } \
> +void logmsg(int pri, const char *format, ...)
> +{
> + FILE *out = log_to_stdout ? stdout : stderr;
> + struct timespec tp;
> + va_list args;
> +
> + if (setlogmask(0) & LOG_MASK(LOG_DEBUG) && log_file == -1) {
> + clock_gettime(CLOCK_REALTIME, &tp);
> + fprintf(out, "%lli.%04lli: ",
> + (long long int)tp.tv_sec - log_start,
> + (long long int)tp.tv_nsec / (100L * 1000));
> + }
> +
> + if ((LOG_MASK(LOG_PRI(pri)) & log_mask) || BEFORE_DAEMON) {
> + va_start(args, format);
> + if (log_file != -1)
> + logfile_write(pri, format, args);
> + else if (!(setlogmask(0) & LOG_MASK(LOG_DEBUG)))
> + passt_vsyslog(pri, format, args);
> + va_end(args);
> + }
> +
> + if ((setlogmask(0) & LOG_MASK(LOG_DEBUG) && log_file == -1) ||
> + (BEFORE_DAEMON && !(log_opt & LOG_PERROR))) {
> + va_start(args, format);
> + (void)vfprintf(out, format, args);
> + va_end(args);
> + if (format[strlen(format)] != '\n')
> + fprintf(out, "\n");
> + }
> }
>
> /* Prefixes for log file messages, indexed by priority */
> @@ -89,11 +89,6 @@ const char *logfile_prefix[] = {
> " ", /* LOG_DEBUG */
> };
>
> -logfn(err, LOG_ERR)
> -logfn(warn, LOG_WARNING)
> -logfn(info, LOG_INFO)
> -logfn(debug,LOG_DEBUG)
> -
> /**
> * trace_init() - Set log_trace depending on trace (debug) mode
> * @enable: Tracing debug mode enabled if non-zero
> diff --git a/log.h b/log.h
> index a17171a..b4fb7e9 100644
> --- a/log.h
> +++ b/log.h
> @@ -6,14 +6,18 @@
> #ifndef LOG_H
> #define LOG_H
>
> +#include <syslog.h>
> +
> #define LOGFILE_SIZE_DEFAULT (1024 * 1024UL)
> #define LOGFILE_CUT_RATIO 30 /* When full, cut ~30% size */
> #define LOGFILE_SIZE_MIN (5UL * MAX(BUFSIZ, PAGE_SIZE))
>
> -void err(const char *format, ...);
> -void warn(const char *format, ...);
> -void info(const char *format, ...);
> -void debug(const char *format, ...);
> +void logmsg(int pri, const char *format, ...);
> +
> +#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 die(...) \
> do { \
--
David Gibson | 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 --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-10-13 5:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-10-12 5:09 [PATCH] log: Don't define logging function 4 times David Gibson
2023-10-13 5:17 ` David Gibson
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).