From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33778) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aQzf7-0001DA-8I for qemu-devel@nongnu.org; Wed, 03 Feb 2016 10:48:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aQzf3-0002Z9-Sj for qemu-devel@nongnu.org; Wed, 03 Feb 2016 10:48:09 -0500 Received: from mx1.redhat.com ([209.132.183.28]:51765) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aQzf3-0002Yk-A6 for qemu-devel@nongnu.org; Wed, 03 Feb 2016 10:48:05 -0500 From: Stefan Hajnoczi Date: Wed, 3 Feb 2016 15:47:40 +0000 Message-Id: <1454514465-11856-9-git-send-email-stefanha@redhat.com> In-Reply-To: <1454514465-11856-1-git-send-email-stefanha@redhat.com> References: <1454514465-11856-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL 08/13] trace: add "-trace help" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: "Denis V. Lunev" , Peter Maydell , Stefan Hajnoczi , Paolo Bonzini From: Paolo Bonzini Print a list of trace points Signed-off-by: Paolo Bonzini Signed-off-by: Denis V. Lunev Acked-by: Christian Borntraeger Message-id: 1452174932-28657-7-git-send-email-den@openvz.org Signed-off-by: Stefan Hajnoczi --- qemu-options.hx | 2 ++ trace/control.c | 21 ++++++++++++++++++++- trace/control.h | 7 +++++++ 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/qemu-options.hx b/qemu-options.hx index 35dc725..733a194 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -3564,6 +3564,8 @@ available if QEMU has been compiled with the @var{simple}, @var{stderr} or @var{ftrace} tracing backend. To specify multiple events or patterns, specify the @option{-trace} option multiple times. +Use @code{-trace help} to print a list of names of trace points. + @item events=@var{file} Immediately enable events listed in @var{file}. The file must contain one event name (as listed in the @file{trace-events} file) diff --git a/trace/control.c b/trace/control.c index af92705..bef7884 100644 --- a/trace/control.c +++ b/trace/control.c @@ -88,7 +88,16 @@ TraceEvent *trace_event_pattern(const char *pat, TraceEvent *ev) return NULL; } -void trace_enable_events(const char *line_buf) +void trace_list_events(void) +{ + int i; + for (i = 0; i < trace_event_count(); i++) { + TraceEvent *res = trace_event_id(i); + fprintf(stderr, "%s\n", trace_event_get_name(res)); + } +} + +static void do_trace_enable_events(const char *line_buf) { const bool enable = ('-' != line_buf[0]); const char *line_ptr = enable ? line_buf : line_buf + 1; @@ -114,6 +123,16 @@ void trace_enable_events(const char *line_buf) } } +void trace_enable_events(const char *line_buf) +{ + if (is_help_option(line_buf)) { + trace_list_events(); + exit(0); + } else { + do_trace_enable_events(line_buf); + } +} + void trace_init_events(const char *fname) { Location loc; diff --git a/trace/control.h b/trace/control.h index d5081ce..d5bc86e 100644 --- a/trace/control.h +++ b/trace/control.h @@ -182,6 +182,13 @@ void trace_init_events(const char *file); void trace_init_file(const char *file); /** + * trace_list_events: + * + * List all available events. + */ +void trace_list_events(void); + +/** * trace_enable_events: * @line_buf: A string with a glob pattern of events to be enabled or, * if the string starts with '-', disabled. -- 2.5.0