From patchwork Thu Aug 25 19:18:04 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?Q?Llu=C3=ADs?= X-Patchwork-Id: 111653 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id CD932B6F7E for ; Fri, 26 Aug 2011 05:53:36 +1000 (EST) Received: from localhost ([::1]:58466 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QwfRr-00008B-2k for incoming@patchwork.ozlabs.org; Thu, 25 Aug 2011 15:18:43 -0400 Received: from eggs.gnu.org ([140.186.70.92]:47088) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QwfRR-0007c7-DL for qemu-devel@nongnu.org; Thu, 25 Aug 2011 15:18:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QwfRP-00046k-OH for qemu-devel@nongnu.org; Thu, 25 Aug 2011 15:18:17 -0400 Received: from mailout-de.gmx.net ([213.165.64.23]:51395) by eggs.gnu.org with smtp (Exim 4.71) (envelope-from ) id 1QwfRP-00046U-3v for qemu-devel@nongnu.org; Thu, 25 Aug 2011 15:18:15 -0400 Received: (qmail invoked by alias); 25 Aug 2011 19:18:13 -0000 Received: from unknown (EHLO localhost) [84.88.53.92] by mail.gmx.net (mp045) with SMTP; 25 Aug 2011 21:18:13 +0200 X-Authenticated: #12333383 X-Provags-ID: V01U2FsdGVkX19cnsJBGCxcQpF6vqhmKh4M229jGN0xtJ/tLNZakO /PjMIOZ0WVnty/ To: qemu-devel@nongnu.org, chouteau@adacore.com From: =?utf-8?b?TGx1w61z?= Date: Thu, 25 Aug 2011 21:18:04 +0200 Message-ID: <20110825191804.1413.26801.stgit@ginnungagap.bsc.es> In-Reply-To: <20110825191731.1413.26838.stgit@ginnungagap.bsc.es> References: <20110825191731.1413.26838.stgit@ginnungagap.bsc.es> User-Agent: StGit/0.15 MIME-Version: 1.0 X-Y-GMX-Trusted: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 213.165.64.23 Cc: stefanha@gmail.com Subject: [Qemu-devel] [PATCH v7 05/13] trace: avoid conditional code compilation during option parsing X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Lluís Vilanova --- Makefile.objs | 8 ++++++++ qemu-config.c | 4 ---- qemu-options.hx | 6 ++++-- trace/control.h | 23 +++++++++++++++++++++++ trace/dtrace.c | 12 ++++++++++++ trace/nop.c | 12 ++++++++++++ trace/simple.c | 15 ++++++++++++--- trace/simple.h | 8 -------- trace/stderr.c | 12 ++++++++++++ trace/ust.c | 12 ++++++++++++ vl.c | 28 ++++++++++++++++++---------- 11 files changed, 113 insertions(+), 27 deletions(-) create mode 100644 trace/control.h create mode 100644 trace/dtrace.c create mode 100644 trace/nop.c create mode 100644 trace/stderr.c create mode 100644 trace/ust.c diff --git a/Makefile.objs b/Makefile.objs index f1dfeda..4f5392a 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -379,9 +379,17 @@ ifneq ($(TRACE_BACKEND),dtrace) trace-obj-y = trace.o endif +trace-nested-$(CONFIG_TRACE_NOP) += nop.o + trace-nested-$(CONFIG_TRACE_SIMPLE) += simple.o trace-obj-$(CONFIG_TRACE_SIMPLE) += qemu-timer-common.o +trace-nested-$(CONFIG_TRACE_STDERR) += stderr.o + +trace-nested-$(CONFIG_TRACE_UST) += ust.o + +trace-nested-$(CONFIG_TRACE_DTRACE) += dtrace.o + trace-obj-y += $(addprefix trace/, $(trace-nested-y)) ###################################################################### diff --git a/qemu-config.c b/qemu-config.c index 4b79103..f67d3a5 100644 --- a/qemu-config.c +++ b/qemu-config.c @@ -302,7 +302,6 @@ static QemuOptsList qemu_mon_opts = { }, }; -#ifdef CONFIG_TRACE_SIMPLE static QemuOptsList qemu_trace_opts = { .name = "trace", .implied_opt_name = "trace", @@ -315,7 +314,6 @@ static QemuOptsList qemu_trace_opts = { { /* end of list */ } }, }; -#endif static QemuOptsList qemu_cpudef_opts = { .name = "cpudef", @@ -516,9 +514,7 @@ static QemuOptsList *vm_config_groups[32] = { &qemu_global_opts, &qemu_mon_opts, &qemu_cpudef_opts, -#ifdef CONFIG_TRACE_SIMPLE &qemu_trace_opts, -#endif &qemu_option_rom_opts, &qemu_machine_opts, &qemu_boot_opts, diff --git a/qemu-options.hx b/qemu-options.hx index 8a31b4f..d6421b9 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -2432,17 +2432,19 @@ Normally QEMU loads a configuration file from @var{sysconfdir}/qemu.conf and @var{sysconfdir}/target-@var{ARCH}.conf on startup. The @code{-nodefconfig} option will prevent QEMU from loading these configuration files at startup. ETEXI -#ifdef CONFIG_TRACE_SIMPLE DEF("trace", HAS_ARG, QEMU_OPTION_trace, "-trace\n" " Specify a trace file to log traces to\n", QEMU_ARCH_ALL) STEXI +HXCOMM This line is not accurate, as the option is backend-specific but HX does +HXCOMM not support conditional compilation of text. @item -trace @findex -trace Specify a trace file to log output traces to. + +This option is available only when using the @var{simple} tracing backend. ETEXI -#endif HXCOMM This is the last statement. Insert new options before this line! STEXI diff --git a/trace/control.h b/trace/control.h new file mode 100644 index 0000000..80526f7 --- /dev/null +++ b/trace/control.h @@ -0,0 +1,23 @@ +/* + * Interface for configuring and controlling the state of tracing events. + * + * Copyright (C) 2011 Lluís Vilanova + * + * This work is licensed under the terms of the GNU GPL, version 2. See + * the COPYING file in the top-level directory. + */ + +#ifndef TRACE_CONTROL_H +#define TRACE_CONTROL_H + +#include + +/** Whether any cmdline trace option is avilable. */ +bool trace_config_init (void); +/** Configure output trace file. + * + * @return Whether cmdline option is available. + */ +bool trace_config_init_file (const char *file); + +#endif /* TRACE_CONTROL_H */ diff --git a/trace/dtrace.c b/trace/dtrace.c new file mode 100644 index 0000000..e0121ca --- /dev/null +++ b/trace/dtrace.c @@ -0,0 +1,12 @@ +#inclued "trace/control.h" + + +bool trace_config_init (void) +{ + return false; +} + +bool trace_config_init_file (const char *file) +{ + return false; +} diff --git a/trace/nop.c b/trace/nop.c new file mode 100644 index 0000000..e0121ca --- /dev/null +++ b/trace/nop.c @@ -0,0 +1,12 @@ +#inclued "trace/control.h" + + +bool trace_config_init (void) +{ + return false; +} + +bool trace_config_init_file (const char *file) +{ + return false; +} diff --git a/trace/simple.c b/trace/simple.c index de355e9..f3891c1 100644 --- a/trace/simple.c +++ b/trace/simple.c @@ -16,6 +16,7 @@ #include #include "qemu-timer.h" #include "trace.h" +#include "trace/control.h" /** Trace file header event ID */ #define HEADER_EVENT_ID (~(uint64_t)0) /* avoids conflicting with TraceEventIDs */ @@ -330,7 +331,7 @@ void st_flush_trace_buffer(void) flush_trace_file(true); } -bool st_init(const char *file) +bool trace_config_init (void) { pthread_t thread; pthread_attr_t attr; @@ -346,10 +347,18 @@ bool st_init(const char *file) pthread_sigmask(SIG_SETMASK, &oldset, NULL); if (ret != 0) { - return false; + fprintf(stderr, "warning: unable to initialize simple trace backend\n"); + } + else { + atexit(st_flush_trace_buffer); + st_set_trace_file(NULL); } + return true; +} - atexit(st_flush_trace_buffer); +bool trace_config_init_file (const char *file) +{ st_set_trace_file(file); + return true; } diff --git a/trace/simple.h b/trace/simple.h index 77633ab..08b9a52 100644 --- a/trace/simple.h +++ b/trace/simple.h @@ -15,7 +15,6 @@ #include #include -#ifdef CONFIG_TRACE_SIMPLE typedef uint64_t TraceEventID; typedef struct { @@ -37,12 +36,5 @@ void st_print_trace_file_status(FILE *stream, fprintf_function stream_printf); void st_set_trace_file_enabled(bool enable); bool st_set_trace_file(const char *file); void st_flush_trace_buffer(void); -bool st_init(const char *file); -#else -static inline bool st_init(const char *file) -{ - return true; -} -#endif /* !CONFIG_TRACE_SIMPLE */ #endif /* TRACE_SIMPLE_H */ diff --git a/trace/stderr.c b/trace/stderr.c new file mode 100644 index 0000000..e0121ca --- /dev/null +++ b/trace/stderr.c @@ -0,0 +1,12 @@ +#inclued "trace/control.h" + + +bool trace_config_init (void) +{ + return false; +} + +bool trace_config_init_file (const char *file) +{ + return false; +} diff --git a/trace/ust.c b/trace/ust.c new file mode 100644 index 0000000..e0121ca --- /dev/null +++ b/trace/ust.c @@ -0,0 +1,12 @@ +#inclued "trace/control.h" + + +bool trace_config_init (void) +{ + return false; +} + +bool trace_config_init_file (const char *file) +{ + return false; +} diff --git a/vl.c b/vl.c index 145d738..ed2db9a 100644 --- a/vl.c +++ b/vl.c @@ -156,7 +156,7 @@ int main(int argc, char **argv) #include "slirp/libslirp.h" #include "trace.h" -#include "trace/simple.h" +#include "trace/control.h" #include "qemu-queue.h" #include "cpus.h" #include "arch_init.h" @@ -2130,7 +2130,6 @@ int main(int argc, char **argv, char **envp) int show_vnc_port = 0; #endif int defconfig = 1; - const char *trace_file = NULL; const char *log_mask = NULL; const char *log_file = NULL; GMemVTable mem_trace = { @@ -2928,14 +2927,27 @@ int main(int argc, char **argv, char **envp) } xen_mode = XEN_ATTACH; break; -#ifdef CONFIG_TRACE_SIMPLE case QEMU_OPTION_trace: + { opts = qemu_opts_parse(qemu_find_opts("trace"), optarg, 0); - if (opts) { - trace_file = qemu_opt_get(opts, "file"); + if (!opts) { + exit(1); + } + if (!trace_config_init()) { + fprintf(stderr, "qemu: error: option \"-%s\" is not " + "supported by the selected tracing backend\n", + popt->name); + exit(1); + } + const char *trace_file = qemu_opt_get(opts, "file"); + if (trace_file && !trace_config_init_file(trace_file)) { + fprintf(stderr, "error: suboption \"-%s file\" is not " + "supported by the selected tracing backend\n", + popt->name); + exit(1); } break; -#endif + } case QEMU_OPTION_readconfig: { int ret = qemu_read_config_file(optarg); @@ -2993,10 +3005,6 @@ int main(int argc, char **argv, char **envp) set_cpu_log(log_mask); } - if (!st_init(trace_file)) { - fprintf(stderr, "warning: unable to initialize simple trace backend\n"); - } - /* If no data_dir is specified then try to find it relative to the executable path. */ if (!data_dir) {