[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 3/9] qemu-log: Avoid function call for disabled q
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PATCH v5 3/9] qemu-log: Avoid function call for disabled qemu_log_mask logging |
Date: |
Thu, 4 Feb 2016 14:56:15 +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 ++++++++++---
qemu-log.c | 11 -----------
2 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/include/qemu/log.h b/include/qemu/log.h
index d837d90..776ceaf 100644
--- a/include/qemu/log.h
+++ b/include/qemu/log.h
@@ -73,10 +73,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)
/* Special cases: */
diff --git a/qemu-log.c b/qemu-log.c
index 5d11fe7..8c59063 100644
--- a/qemu-log.c
+++ b/qemu-log.c
@@ -36,17 +36,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.0