From patchwork Tue Jun 8 07:08:58 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Prerna Saxena X-Patchwork-Id: 54941 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 81CCFB7D64 for ; Tue, 8 Jun 2010 17:10:59 +1000 (EST) Received: from localhost ([127.0.0.1]:52146 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OLsxc-0003wn-8m for incoming@patchwork.ozlabs.org; Tue, 08 Jun 2010 03:10:56 -0400 Received: from [140.186.70.92] (port=48499 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OLsvs-0003bU-S5 for qemu-devel@nongnu.org; Tue, 08 Jun 2010 03:09:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OLsvr-0005t6-Ba for qemu-devel@nongnu.org; Tue, 08 Jun 2010 03:09:08 -0400 Received: from e23smtp07.au.ibm.com ([202.81.31.140]:49463) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OLsvq-0005so-GW for qemu-devel@nongnu.org; Tue, 08 Jun 2010 03:09:07 -0400 Received: from d23relay03.au.ibm.com (d23relay03.au.ibm.com [202.81.31.245]) by e23smtp07.au.ibm.com (8.14.4/8.13.1) with ESMTP id o587978h032261 for ; Tue, 8 Jun 2010 17:09:07 +1000 Received: from d23av04.au.ibm.com (d23av04.au.ibm.com [9.190.235.139]) by d23relay03.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id o58794rC1872060 for ; Tue, 8 Jun 2010 17:09:04 +1000 Received: from d23av04.au.ibm.com (loopback [127.0.0.1]) by d23av04.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id o58793Gu013223 for ; Tue, 8 Jun 2010 17:09:03 +1000 Received: from zephyr ([9.124.35.20]) by d23av04.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id o58791Zr013181; Tue, 8 Jun 2010 17:09:02 +1000 Date: Tue, 8 Jun 2010 12:38:58 +0530 From: Prerna Saxena To: qemu-devel@nongnu.org Message-ID: <20100608123858.6d7dc770@zephyr> In-Reply-To: <20100608122803.6a684a5e@zephyr> References: <20100608122803.6a684a5e@zephyr> Organization: IBM X-Mailer: Claws Mail 3.7.5 (GTK+ 2.16.6; i586-redhat-linux-gnu) Mime-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) Cc: Anthony Liguori , Stefan Hajnoczi , kvm@vger.kernel.org, Jan Kiszka , maneesh@linux.vnet.ibm.com, ananth@linux.vnet.ibm.com Subject: [Qemu-devel] [PATCH 3/3] Toggle tracepoint state X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This patch adds support for dynamically enabling/disabling of tracepoints. Monitor commands added : 1) info tracepoints : to view all available tracepoints and their state. 2) tracepoint NAME on|off : to enable/disable data logging from a given tracepoint. Eg, tracepoint paio_submit off disables logging of data when paio_submit is hit. At present this is done with a simple comparison -- there is scope for optimizations that can be employed here to speed this up. Signed-off-by: Prerna Saxena --- monitor.c | 21 +++++++++++++++++++++ qemu-monitor.hx | 16 ++++++++++++++++ simpletrace.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- tracetool | 30 ++++++++++++++++++++++++++---- vl.c | 6 ++++++ 5 files changed, 123 insertions(+), 5 deletions(-) diff --git a/monitor.c b/monitor.c index fda29aa..1e05b38 100644 --- a/monitor.c +++ b/monitor.c @@ -547,7 +547,19 @@ static void do_commit(Monitor *mon, const QDict *qdict) bdrv_commit(dinfo->bdrv); } } +#ifdef CONFIG_SIMPLE_TRACE +static void do_change_tracepoint_state(Monitor *mon, const QDict *qdict) +{ + const char *tp_name = qdict_get_str(qdict, "name"); + const char *tp_state = qdict_get_str(qdict, "option"); + if (!strncmp(tp_state, "on", 2)) + change_tracepoint_state(tp_name, 1); + if (!strncmp(tp_state, "off", 3)) + change_tracepoint_state(tp_name, 0); + return; +} +#endif static void user_monitor_complete(void *opaque, QObject *ret_data) { MonitorCompletionData *data = (MonitorCompletionData *)opaque; @@ -2783,6 +2795,15 @@ static const mon_cmd_t info_cmds[] = { .help = "show roms", .mhandler.info = do_info_roms, }, +#ifdef CONFIG_SIMPLE_TRACE + { + .name = "tracepoints", + .args_type = "", + .params = "", + .help = "show available tracepoints & their state", + .mhandler.info = do_info_all_tracepoints, + }, +#endif { .name = NULL, }, diff --git a/qemu-monitor.hx b/qemu-monitor.hx index c604aec..36481ea 100644 --- a/qemu-monitor.hx +++ b/qemu-monitor.hx @@ -114,6 +114,8 @@ show migration status show balloon information @item info qtree show device tree +@item info tracepoints +show available tracepoints and their state @end table ETEXI @@ -236,6 +238,20 @@ STEXI @item trace @findex trace show contents of trace buffer +ETEXI + + { + .name = "tracepoint", + .args_type = "name:s,option:s", + .params = "name on|off", + .help = "changes status of a specific tracepoint", + .mhandler.cmd = do_change_tracepoint_state, + }, + +STEXI +@item tracepoint +@findex tracepoint +changes status of a tracepoint #endif ETEXI diff --git a/simpletrace.c b/simpletrace.c index 8f33a81..75d2fca 100644 --- a/simpletrace.c +++ b/simpletrace.c @@ -3,6 +3,12 @@ #include "trace.h" typedef struct { + char *tp_name; + bool state; + unsigned int hash; +} Tracepoint; + +typedef struct { unsigned long event; unsigned long x1; unsigned long x2; @@ -18,10 +24,24 @@ enum { static TraceRecord trace_buf[TRACE_BUF_LEN]; static unsigned int trace_idx; static FILE *trace_fp; +static Tracepoint trace_list[NR_TRACEPOINTS]; + +void init_tracepoint(const char *tname, TraceEvent tevent) { + if (!tname || tevent > NR_TRACEPOINTS) + return; + + trace_list[tevent].tp_name = (char*)qemu_malloc(strlen(tname)+1); + strncpy(trace_list[tevent].tp_name, tname, strlen(tname)); + trace_list[tevent].hash = tdb_hash(tname); + trace_list[tevent].state = 1; /* Enable all by default */ + return; +} static void trace(TraceEvent event, unsigned long x1, unsigned long x2, unsigned long x3, unsigned long x4, unsigned long x5) { + if (!trace_list[event].state) + return; TraceRecord *rec = &trace_buf[trace_idx]; rec->event = event; rec->x1 = x1; @@ -64,7 +84,7 @@ void trace5(TraceEvent event, unsigned long x1, unsigned long x2, unsigned long } void do_info_trace(Monitor *mon) { - static unsigned int i, max_idx; + unsigned int i, max_idx; if (trace_idx) max_idx = trace_idx; @@ -77,3 +97,36 @@ void do_info_trace(Monitor *mon) { trace_buf[i].x3, trace_buf[i].x4, trace_buf[i].x5); return; } + +void do_info_all_tracepoints(Monitor *mon) { + unsigned int i; + for (i=0; i= 0) + trace_list[i].state = tstate; + return; +} diff --git a/tracetool b/tracetool index 6c15154..cc2b22c 100755 --- a/tracetool +++ b/tracetool @@ -123,14 +123,20 @@ linetoc_end_nop() linetoh_begin_simple() { cat < + typedef unsigned int TraceEvent; +void init_tracepoint_table(void); +void init_tracepoint(const char *tname, TraceEvent tevent); void trace1(TraceEvent event, unsigned long x1); void trace2(TraceEvent event, unsigned long x1, unsigned long x2); void trace3(TraceEvent event, unsigned long x1, unsigned long x2, unsigned long x3); void trace4(TraceEvent event, unsigned long x1, unsigned long x2, unsigned long x3, unsigned long x4); void trace5(TraceEvent event, unsigned long x1, unsigned long x2, unsigned long x3, unsigned long x4, unsigned long x5); void do_info_trace(Monitor *mon); +void do_info_all_tracepoints(Monitor *mon); +void change_tracepoint_state(const char *tname, bool tstate); EOF simple_event_num=0 @@ -163,22 +169,38 @@ EOF linetoh_end_simple() { - return + cat <