mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qemu-log: Avoid function call for disabled qemu_log_mask logging

Browse Source 
Make qemu_log_mask() a macro which only calls the function to
do the actual work if the logging is enabled. This avoids making
a function call in possible fast paths where logging is disabled.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Peter Maydell 2016-03-15 19:12:03 +01:00 committed by Paolo Bonzini
parent 541957361e
commit 7ee606230e
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/qemu/log.h
View File

@ -66,10 +66,17 @@ qemu_log_vprintf(const char *fmt, va_list va)
} }
} }
/* log only if a bit is set on the current loglevel mask /* log only if a bit is set on the current loglevel mask:
* @mask: bit to check in the mask
* @fmt: printf-style format string
* @args: optional arguments for format string
*/ */
void GCC_FMT_ATTR(2, 3) qemu_log_mask(int mask, const char *fmt, ...); #define qemu_log_mask(MASK, FMT, ...) \
do { \
if (unlikely(qemu_loglevel_mask(MASK))) { \
qemu_log(FMT, ## __VA_ARGS__); \
} \
} while (0)
/* Maintenance: */ /* Maintenance: */

11
util/log.c
View File

@ -38,17 +38,6 @@ void qemu_log(const char *fmt, ...)
va_end(ap); va_end(ap);
} }
void qemu_log_mask(int mask, const char *fmt, ...)
{
va_list ap;
va_start(ap, fmt);
if ((qemu_loglevel & mask) && qemu_logfile) {
vfprintf(qemu_logfile, fmt, ap);
}
va_end(ap);
}
/* enable or disable low levels log */ /* enable or disable low levels log */
void do_qemu_set_log(int log_flags, bool use_own_buffers) void do_qemu_set_log(int log_flags, bool use_own_buffers)
{ {