From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LMryH-00073V-I7 for qemu-devel@nongnu.org; Tue, 13 Jan 2009 17:42:53 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LMryG-00071P-18 for qemu-devel@nongnu.org; Tue, 13 Jan 2009 17:42:52 -0500 Received: from [199.232.76.173] (port=42394 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LMryF-00071C-KE for qemu-devel@nongnu.org; Tue, 13 Jan 2009 17:42:51 -0500 Received: from mx2.redhat.com ([66.187.237.31]:56412) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1LMryE-0003pK-OQ for qemu-devel@nongnu.org; Tue, 13 Jan 2009 17:42:51 -0500 From: Eduardo Habkost Date: Tue, 13 Jan 2009 20:42:30 -0200 Message-Id: <1231886553-4728-3-git-send-email-ehabkost@redhat.com> In-Reply-To: <1231886553-4728-1-git-send-email-ehabkost@redhat.com> References: <1231886553-4728-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PATCH 2/5] Define macros that will become the new logging API Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: qemu-devel@nongnu.org, Eduardo Habkost These macros are NOT a proposal for a definitive new logging API. They are just a step for it: a way to mark all usage patterns of the logfile/loglevel variables on a single place. Signed-off-by: Eduardo Habkost --- qemu-log.h | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 86 insertions(+), 0 deletions(-) diff --git a/qemu-log.h b/qemu-log.h index 1ebea81..fccfb11 100644 --- a/qemu-log.h +++ b/qemu-log.h @@ -1,7 +1,93 @@ #ifndef QEMU_LOG_H #define QEMU_LOG_H +/* The deprecated global variables: */ extern FILE *logfile; extern int loglevel; + +/* + * The new API: + * + */ + +/* Log settings checking macros: */ + +/* Returns true if qemu_log() will really write somewhere + */ +#define qemu_log_enabled() (logfile != NULL) + +/* Returns true if a bit is set in the current loglevel mask + */ +#define qemu_loglevel_mask(b) ((loglevel & (b)) != 0) + + +/* Logging functions: */ + +/* main logging function + */ +#define qemu_log(...) do { \ + if (logfile) \ + fprintf(logfile, ## __VA_ARGS__); \ + } while (0) + +/* vfprintf-like logging function + */ +#define qemu_log_vprintf(fmt, va) do { \ + if (logfile) \ + vfprintf(logfile, fmt, va); \ + } while (0) + +/* log only if a bit is set on the current loglevel mask + */ +#define qemu_log_mask(b, ...) do { \ + if (loglevel & (b)) \ + fprintf(logfile, ## __VA_ARGS__); \ + } while (0) + + + + +/* Special cases: */ + +/* cpu_dump_state() logging functions: */ +#define log_cpu_state(env, f) cpu_dump_state((env), logfile, fprintf, (f)); +#define log_cpu_state_mask(b, env, f) do { \ + if (loglevel & (b)) log_cpu_state((env), (f)); \ + } while (0) + +/* disas() and target_disas() to logfile: */ +#define log_target_disas(start, len, flags) \ + target_disas(logfile, (start), (len), (flags)) +#define log_disas(start, len) \ + disas(logfile, (start), (len)) + +/* page_dump() output to the log file: */ +#define log_page_dump() page_dump(logfile) + + + +/* Maintenance: */ + +/* fflush() the log file */ +#define qemu_log_flush() fflush(logfile) + +/* Close the log file */ +#define qemu_log_close() do { \ + fclose(logfile); \ + logfile = NULL; \ + } while (0) + +/* Set up a new log file */ +#define qemu_log_set_file(f) do { \ + logfile = (f); \ + } while (0) + +/* Set up a new log file, only if none is set */ +#define qemu_log_try_set_file(f) do { \ + if (!logfile) \ + logfile = (f); \ + } while (0) + + #endif -- 1.5.6.rc3.11.g5f54d