[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v9 3/9] qemu-log: Avoid function call for disabled q
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PATCH v9 3/9] qemu-log: Avoid function call for disabled qemu_log_mask logging |
Date: |
Tue, 15 Mar 2016 14:30:18 +0000 |
From: Peter Maydell <address@hidden>
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 <address@hidden>
Signed-off-by: Alex Bennée <address@hidden>
Reviewed-by: Andreas Färber <address@hidden>
---
v4
- fix s-o-b tags, add r-b tag
---
include/qemu/log.h | 13 ++++++++++---
util/log.c | 11 -----------
2 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/include/qemu/log.h b/include/qemu/log.h
index 40c24fd..523c886 100644
--- a/include/qemu/log.h
+++ b/include/qemu/log.h
@@ -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: */
diff --git a/util/log.c b/util/log.c
index a14d480..4e69586 100644
--- a/util/log.c
+++ b/util/log.c
@@ -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)
{
--
2.7.2
- [Qemu-devel] [PATCH v9 0/9] qemu-log, -dfilter and other logging tweaks, Alex Bennée, 2016/03/15
- [Qemu-devel] [PATCH v9 3/9] qemu-log: Avoid function call for disabled qemu_log_mask logging,
Alex Bennée <=
- [Qemu-devel] [PATCH v9 1/9] tcg: pass down TranslationBlock to tcg_code_gen, Alex Bennée, 2016/03/15
- [Qemu-devel] [PATCH v9 2/9] qemu-log: correct help text for -d cpu, Alex Bennée, 2016/03/15
- [Qemu-devel] [PATCH v9] cputlb: modernise the debug support, Alex Bennée, 2016/03/15
- [Qemu-devel] [PATCH v9 8/9] qemu-log: support simple pid substitution for logs, Alex Bennée, 2016/03/15
- [Qemu-devel] [PATCH v9 7/9] target-arm: dfilter support for in_asm, Alex Bennée, 2016/03/15
- [Qemu-devel] [PATCH v9 4/9] qemu-log: Improve the "exec" TB execution logging, Alex Bennée, 2016/03/15
- [Qemu-devel] [PATCH v9 9/9] cputlb: modernise the debug support, Alex Bennée, 2016/03/15
- [Qemu-devel] [PATCH v9 6/9] qemu-log: dfilter-ise exec, out_asm, op and opt_op, Alex Bennée, 2016/03/15
- [Qemu-devel] [PATCH v9 5/9] qemu-log: new option -dfilter to limit output, Alex Bennée, 2016/03/15
- Re: [Qemu-devel] [PATCH v9 0/9] qemu-log, -dfilter and other logging tweaks, Richard Henderson, 2016/03/15