mirrors/passt
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

log: Don't define logging function 4 times

Browse source 
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>
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
This commit is contained in:
David Gibson 2023-10-13 15:50:28 +11:00 committed by Stefano Brivio
parent 0ad54e1043
commit 50d46ec847
2 changed files with 38 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
log.c
View file

@ -47,36 +47,36 @@ int log_to_stdout; /* Print to stdout instead of stderr */
#define BEFORE_DAEMON (setlogmask(0) == LOG_MASK(LOG_EMERG)) #define BEFORE_DAEMON (setlogmask(0) == LOG_MASK(LOG_EMERG))
#define logfn(name, level) \ void logmsg(int pri, const char *format, ...)
void name(const char *format, ...) { \ {
FILE *out = log_to_stdout ? stdout : stderr; \ FILE *out = log_to_stdout ? stdout : stderr;
struct timespec tp; \ struct timespec tp;
va_list args; \ va_list args;
\
if (setlogmask(0) & LOG_MASK(LOG_DEBUG) && log_file == -1) { \ if (setlogmask(0) & LOG_MASK(LOG_DEBUG) && log_file == -1) {
clock_gettime(CLOCK_REALTIME, &tp); \ clock_gettime(CLOCK_REALTIME, &tp);
fprintf(out, "%lli.%04lli: ", \ fprintf(out, "%lli.%04lli: ",
(long long int)tp.tv_sec - log_start, \ (long long int)tp.tv_sec - log_start,
(long long int)tp.tv_nsec / (100L * 1000)); \ (long long int)tp.tv_nsec / (100L * 1000));
} \ }
\
if ((LOG_MASK(LOG_PRI(level)) & log_mask) || BEFORE_DAEMON) { \ if ((LOG_MASK(LOG_PRI(pri)) & log_mask) || BEFORE_DAEMON) {
va_start(args, format); \ va_start(args, format);
if (log_file != -1) \ if (log_file != -1)
logfile_write(level, format, args); \ logfile_write(pri, format, args);
else if (!(setlogmask(0) & LOG_MASK(LOG_DEBUG))) \ else if (!(setlogmask(0) & LOG_MASK(LOG_DEBUG)))
passt_vsyslog(level, format, args); \ passt_vsyslog(pri, format, args);
va_end(args); \ va_end(args);
} \ }
\
if ((setlogmask(0) & LOG_MASK(LOG_DEBUG) && log_file == -1) || \ if ((setlogmask(0) & LOG_MASK(LOG_DEBUG) && log_file == -1) ||
(BEFORE_DAEMON && !(log_opt & LOG_PERROR))) { \ (BEFORE_DAEMON && !(log_opt & LOG_PERROR))) {
va_start(args, format); \ va_start(args, format);
(void)vfprintf(out, format, args); \ (void)vfprintf(out, format, args);
va_end(args); \ va_end(args);
if (format[strlen(format)] != '\n') \ if (format[strlen(format)] != '\n')
fprintf(out, "\n"); \ fprintf(out, "\n");
} \ }
} }
/* Prefixes for log file messages, indexed by priority */ /* Prefixes for log file messages, indexed by priority */
@ -89,11 +89,6 @@ const char *logfile_prefix[] = {
" ", /* LOG_DEBUG */ " ", /* 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 * trace_init() - Set log_trace depending on trace (debug) mode
* @enable: Tracing debug mode enabled if non-zero * @enable: Tracing debug mode enabled if non-zero

12
log.h
View file

@ -6,14 +6,18 @@
#ifndef LOG_H #ifndef LOG_H
#define LOG_H #define LOG_H
#include <syslog.h>
#define LOGFILE_SIZE_DEFAULT (1024 * 1024UL) #define LOGFILE_SIZE_DEFAULT (1024 * 1024UL)
#define LOGFILE_CUT_RATIO 30 /* When full, cut ~30% size */ #define LOGFILE_CUT_RATIO 30 /* When full, cut ~30% size */
#define LOGFILE_SIZE_MIN (5UL * MAX(BUFSIZ, PAGE_SIZE)) #define LOGFILE_SIZE_MIN (5UL * MAX(BUFSIZ, PAGE_SIZE))
void err(const char *format, ...); void logmsg(int pri, const char *format, ...);
void warn(const char *format, ...);
void info(const char *format, ...); #define err(...) logmsg(LOG_ERR, __VA_ARGS__)
void debug(const char *format, ...); #define warn(...) logmsg(LOG_WARNING, __VA_ARGS__)
#define info(...) logmsg(LOG_INFO, __VA_ARGS__)
#define debug(...) logmsg(LOG_DEBUG, __VA_ARGS__)
#define die(...) \ #define die(...) \
do { \ do { \