From patchwork Fri Oct 15 04:40:10 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Prerna Saxena X-Patchwork-Id: 67884 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 2086BB70D6 for ; Fri, 15 Oct 2010 15:43:04 +1100 (EST) Received: from localhost ([127.0.0.1]:51177 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P6c8B-0003c3-VJ for incoming@patchwork.ozlabs.org; Fri, 15 Oct 2010 00:43:00 -0400 Received: from [140.186.70.92] (port=57981 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P6c7J-0003bs-DP for qemu-devel@nongnu.org; Fri, 15 Oct 2010 00:42:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1P6c7I-0002N8-3p for qemu-devel@nongnu.org; Fri, 15 Oct 2010 00:42:05 -0400 Received: from e23smtp05.au.ibm.com ([202.81.31.147]:41457) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1P6c7H-0002Mt-C7 for qemu-devel@nongnu.org; Fri, 15 Oct 2010 00:42:04 -0400 Received: from d23relay04.au.ibm.com (d23relay04.au.ibm.com [202.81.31.246]) by e23smtp05.au.ibm.com (8.14.4/8.13.1) with ESMTP id o9F4bGkY002430 for ; Fri, 15 Oct 2010 15:37:16 +1100 Received: from d23av03.au.ibm.com (d23av03.au.ibm.com [9.190.234.97]) by d23relay04.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id o9F4g1t32568198 for ; Fri, 15 Oct 2010 15:42:01 +1100 Received: from d23av03.au.ibm.com (loopback [127.0.0.1]) by d23av03.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id o9F4g1ak008587 for ; Fri, 15 Oct 2010 15:42:01 +1100 Received: from zephyr ([9.77.91.26]) by d23av03.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id o9F4fwQs008557; Fri, 15 Oct 2010 15:41:59 +1100 Date: Fri, 15 Oct 2010 10:10:10 +0530 From: Prerna Saxena To: qemu-devel Message-ID: <20101015101010.05cebc96@zephyr> In-Reply-To: <20101015100615.10915d2a@zephyr> References: <20101015100615.10915d2a@zephyr> Organization: IBM X-Mailer: Claws Mail 3.7.6 (GTK+ 2.20.1; i386-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 , Hajnoczi , Mahesh , Stefan, Luiz Capitulino , Ananth Narayan Subject: [Qemu-devel] [Tracing][RFC v2 PATCH 1/2] Introduce 'query-trace' & 'query-trace-events' interfaces 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 [PATCH 1/2] Introduce QMP interfaces : query-trace & query-trace-events Signed-off-by: Prerna Saxena --- monitor.c | 46 +++++++++++++++++++++++++++++++++++++++++--- simpletrace.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ simpletrace.h | 4 +++ 3 files changed, 104 insertions(+), 4 deletions(-) diff --git a/monitor.c b/monitor.c index fbb678d..7a150ae 100644 --- a/monitor.c +++ b/monitor.c @@ -941,15 +941,33 @@ static void do_info_cpu_stats(Monitor *mon) #endif #if defined(CONFIG_SIMPLE_TRACE) -static void do_info_trace(Monitor *mon) +static void do_info_trace_print(Monitor *mon) { st_print_trace((FILE *)mon, &monitor_fprintf); } -static void do_info_trace_events(Monitor *mon) +static void do_info_trace(Monitor *mon, QObject **ret_data) +{ + QList *trace_event_list = NULL; + + st_print_trace_to_qlist(&trace_event_list); + + *ret_data = QOBJECT(trace_event_list); +} + +static void do_info_trace_events_print(Monitor *mon, const QObject *data) { st_print_trace_events((FILE *)mon, &monitor_fprintf); } + +static void do_info_trace_events(Monitor *mon, QObject **ret_data) +{ + QList *trace_event_list = NULL; + + st_print_trace_events_to_qlist(&trace_event_list); + + *ret_data = QOBJECT(trace_event_list); +} #endif /** @@ -2606,14 +2624,16 @@ static const mon_cmd_t info_cmds[] = { .args_type = "", .params = "", .help = "show current contents of trace buffer", - .mhandler.info = do_info_trace, + .user_print = do_info_trace_print, + .mhandler.info_new = do_info_trace, }, { .name = "trace-events", .args_type = "", .params = "", .help = "show available trace-events & their state", - .mhandler.info = do_info_trace_events, + .user_print = do_info_trace_events_print, + .mhandler.info_new = do_info_trace_events, }, #endif { @@ -2748,6 +2768,24 @@ static const mon_cmd_t qmp_query_cmds[] = { .mhandler.info_async = do_info_balloon, .flags = MONITOR_CMD_ASYNC, }, +#if defined(CONFIG_SIMPLE_TRACE) + { + .name = "trace", + .args_type = "", + .params = "", + .help = "show current contents of trace buffer", + .user_print = do_info_trace_print, + .mhandler.info_new = do_info_trace, + }, + { + .name = "trace-events", + .args_type = "", + .params = "", + .help = "show available trace-events & their state", + .user_print = do_info_trace_events_print, + .mhandler.info_new = do_info_trace_events, + }, +#endif { /* NULL */ }, }; diff --git a/simpletrace.c b/simpletrace.c index f849e42..a964312 100644 --- a/simpletrace.c +++ b/simpletrace.c @@ -220,6 +220,43 @@ void st_print_trace(FILE *stream, int (*stream_printf)(FILE *stream, const char } } +/** + * Add the current contents of trace-buffer as a QList. + * NOTE: This assumes trace_list hasnt already been allocated with a QList. + * The initialization happens here. + */ +void st_print_trace_to_qlist(QList **tlist) +{ + QObject *data; + unsigned int i; + + assert(tlist); + + *tlist = qlist_new(); + + for (i = 0; i < trace_idx; i++) { + data = qobject_from_jsonf("{" + " 'timestamp': %" PRId64 "," + " 'event': %" PRId64 "," + " 'arg1': %" PRId64 "," + " 'arg2': %" PRId64 "," + " 'arg3': %" PRId64 "," + " 'arg4': %" PRId64 "," + " 'arg5': %" PRId64 "," + " 'arg6': %" PRId64 + "}", + trace_buf[i].timestamp_ns, + trace_buf[i].event, + trace_buf[i].x1, + trace_buf[i].x2, + trace_buf[i].x3, + trace_buf[i].x4, + trace_buf[i].x5, + trace_buf[i].x6); + qlist_append_obj(*tlist, data); + } +} + void st_print_trace_events(FILE *stream, int (*stream_printf)(FILE *stream, const char *fmt, ...)) { unsigned int i; @@ -230,6 +267,27 @@ void st_print_trace_events(FILE *stream, int (*stream_printf)(FILE *stream, cons } } +/** + * Add current set of trace-events as a QList. + * NOTE: This assumes trace_list hasnt already been allocated with a QList. + * The initialization happens here. + */ +void st_print_trace_events_to_qlist(QList **tlist) +{ + QObject *data; + unsigned int i; + + assert(tlist); + + *tlist = qlist_new(); + + for (i = 0; i < NR_TRACE_EVENTS; i++) { + data = qobject_from_jsonf("{ 'name': %s, 'event-id': %d, 'state': %d} ", trace_list[i].tp_name, i, + trace_list[i].state); + qlist_append_obj(*tlist, data); + } +} + static TraceEvent* find_trace_event_by_name(const char *tname) { unsigned int i; diff --git a/simpletrace.h b/simpletrace.h index cf35897..6043c21 100644 --- a/simpletrace.h +++ b/simpletrace.h @@ -14,6 +14,8 @@ #include #include #include +#include "qdict.h" +#include "qjson.h" typedef uint64_t TraceEventID; @@ -36,5 +38,7 @@ void st_print_trace_file_status(FILE *stream, int (*stream_printf)(FILE *stream, void st_set_trace_file_enabled(bool enable); bool st_set_trace_file(const char *file); void st_flush_trace_buffer(void); +void st_print_trace_to_qlist(QList **tlist); +void st_print_trace_events_to_qlist(QList **tlist); #endif /* SIMPLETRACE_H */