Commit 7ee60623 authored by Peter Maydell's avatar Peter Maydell Committed by Paolo Bonzini
Browse files

qemu-log: Avoid function call for disabled qemu_log_mask logging 



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: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarAlex Bennée <alex.bennee@linaro.org>
Reviewed-by: default avatarAndreas Färber <afaerber@suse.de>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 54195736

include/qemu/log.h

+10 −3
Original line number Diff line number Diff line
@@ -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: */

util/log.c

+0 −11
Original line number Diff line number Diff line
@@ -38,17 +38,6 @@ void qemu_log(const char *fmt, ...) 
    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 */

void do_qemu_set_log(int log_flags, bool use_own_buffers)

{