[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 2/7] qemu-log: Avoid function call for disabled q
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PATCH v2 2/7] qemu-log: Avoid function call for disabled qemu_log_mask logging |
Date: |
Fri, 28 Mar 2014 16:43:22 +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>
diff --git a/include/qemu/log.h b/include/qemu/log.h
index d515424..da22e13 100644
--- a/include/qemu/log.h
+++ b/include/qemu/log.h
@@ -64,10 +64,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 35bbb56..83e0cb4 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)
{
--
1.9.1
- [Qemu-devel] [PATCH v2 0/7] qemu-log: various fixes and enhancements, Alex Bennée, 2014/03/28
- [Qemu-devel] [PATCH v2 1/7] qemu-log: correct help text for -d cpu, Alex Bennée, 2014/03/28
- [Qemu-devel] [PATCH v2 2/7] qemu-log: Avoid function call for disabled qemu_log_mask logging,
Alex Bennée <=
- [Qemu-devel] [PATCH v2 4/7] qemu-log: support simple pid substitution in logfile, Alex Bennée, 2014/03/28
- [Qemu-devel] [PATCH v2 3/7] qemu-log: Improve the "exec" TB execution logging, Alex Bennée, 2014/03/28
- [Qemu-devel] [PATCH v2 5/7] qemu-log: new option -dfilter to limit output, Alex Bennée, 2014/03/28
- [Qemu-devel] [PATCH v2 6/7] qemu-log: dfilter-ise exec, in_asm, out_asm, and op_opt, Alex Bennée, 2014/03/28
- [Qemu-devel] [PATCH v2 7/7] qemu-log: add nochain option to disable TB chaining, Alex Bennée, 2014/03/28