From patchwork Mon Oct 26 09:10:23 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Denis V. Lunev" X-Patchwork-Id: 535764 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id B2F92140E31 for ; Mon, 26 Oct 2015 20:15:00 +1100 (AEDT) Received: from localhost ([::1]:51329 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zqdrm-00055l-Tv for incoming@patchwork.ozlabs.org; Mon, 26 Oct 2015 05:14:58 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42731) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zqdnj-0006ef-Fv for qemu-devel@nongnu.org; Mon, 26 Oct 2015 05:10:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zqdne-0001dr-8U for qemu-devel@nongnu.org; Mon, 26 Oct 2015 05:10:47 -0400 Received: from mailhub.sw.ru ([195.214.232.25]:8017 helo=relay.sw.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zqdnd-0001da-P5 for qemu-devel@nongnu.org; Mon, 26 Oct 2015 05:10:42 -0400 Received: from irbis.sw.ru ([10.30.2.139]) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id t9Q9AQTw014460; Mon, 26 Oct 2015 12:10:38 +0300 (MSK) From: "Denis V. Lunev" To: Date: Mon, 26 Oct 2015 12:10:23 +0300 Message-Id: <1445850626-29407-7-git-send-email-den@openvz.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1445850626-29407-1-git-send-email-den@openvz.org> References: <1445850626-29407-1-git-send-email-den@openvz.org> X-detected-operating-system: by eggs.gnu.org: OpenBSD 3.x X-Received-From: 195.214.232.25 Cc: peter.maydell@linaro.org, qemu-devel@nongnu.org, armbru@redhat.com, stefanha@redhat.com, "Denis V. Lunev" , pbonzini@redhat.com Subject: [Qemu-devel] [PATCH 06/11] trace: add "-trace help" 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 From: Paolo Bonzini Print a list of trace points Signed-off-by: Paolo Bonzini Signed-off-by: Denis V. Lunev Reviewed-by: Christian Borntraeger --- 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 6613911..6729a72 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -3490,6 +3490,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 715b5b7..7c84795 100644 --- a/trace/control.c +++ b/trace/control.c @@ -85,7 +85,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; @@ -111,6 +120,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 32a66ce..3707b3b 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.