From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=48207 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OYB3n-0005Iz-Nk for qemu-devel@nongnu.org; Mon, 12 Jul 2010 00:56:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OYB3m-0004dx-67 for qemu-devel@nongnu.org; Mon, 12 Jul 2010 00:56:07 -0400 Received: from e28smtp05.in.ibm.com ([122.248.162.5]:50330) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OYB3l-0004dQ-Gm for qemu-devel@nongnu.org; Mon, 12 Jul 2010 00:56:06 -0400 Received: from d28relay03.in.ibm.com (d28relay03.in.ibm.com [9.184.220.60]) by e28smtp05.in.ibm.com (8.14.4/8.13.1) with ESMTP id o6C4tveT012715 for ; Mon, 12 Jul 2010 10:25:57 +0530 Received: from d28av01.in.ibm.com (d28av01.in.ibm.com [9.184.220.63]) by d28relay03.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id o6C4tvhk4010014 for ; Mon, 12 Jul 2010 10:25:57 +0530 Received: from d28av01.in.ibm.com (loopback [127.0.0.1]) by d28av01.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id o6C4tuxL013691 for ; Mon, 12 Jul 2010 10:25:57 +0530 Date: Mon, 12 Jul 2010 10:25:54 +0530 From: Prerna Saxena Message-ID: <20100712102554.0607b14e@zephyr> In-Reply-To: References: <20100630211145.41631855@zephyr> <20100701091839.GB2344@stefan-thinkpad.transitives.com> <20100706133417.1a344397@zephyr> <20100706101001.GA6651@stefan-thinkpad.transitives.com> <20100708105858.7b456295@zephyr> <20100708092031.GC2174@stefan-thinkpad.transitives.com> <4C35B494.2050800@linux.vnet.ibm.com> <20100708133419.GA22424@stefan-thinkpad.transitives.com> <20100709170036.122681fa@zephyr> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [RFC v5[PATCH][Tracing] Fix build errors for target i386-linux-user List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Stefan Hajnoczi Cc: Maneesh Soni , Stefan@gnu.org, qemu-devel , Hajnoczi , Ananth Narayan [PATCH] Separate monitor command handler interfaces and tracing internals. Changelog from v3: - cleanup ( removed unnecessary references to 'rec' ) Signed-off-by: Prerna Saxena --- monitor.c | 23 +++++++++++++++++++++++ simpletrace.c | 50 ++++++++++++++++++++++++++++---------------------- tracetool | 7 +++++++ 3 files changed, 58 insertions(+), 22 deletions(-) diff --git a/monitor.c b/monitor.c index 433a3ec..1f89938 100644 --- a/monitor.c +++ b/monitor.c @@ -540,6 +540,29 @@ static void do_change_trace_event_state(Monitor *mon, const QDict *qdict) bool new_state = qdict_get_bool(qdict, "option"); change_trace_event_state(tp_name, new_state); } + +void do_info_trace(Monitor *mon) +{ + unsigned int i; + char rec[MAX_TRACE_STR_LEN]; + unsigned int trace_idx = get_trace_idx(); + + for (i = 0; i < trace_idx ; i++) { + if (format_trace_string(i, rec)) { + monitor_printf(mon, rec); + } + } +} + +void do_info_all_trace_events(Monitor *mon) +{ + unsigned int i; + + for (i = 0; i < NR_TRACE_EVENTS; i++) { + monitor_printf(mon, "%s [Event ID %u] : state %u\n", + trace_list[i].tp_name, i, trace_list[i].state); + } +} #endif static void user_monitor_complete(void *opaque, QObject *ret_data) diff --git a/simpletrace.c b/simpletrace.c index 57c41fc..9e3b46c 100644 --- a/simpletrace.c +++ b/simpletrace.c @@ -1,8 +1,8 @@ #include #include -#include "monitor.h" #include "trace.h" +/* Remember to update MAX_TRACE_STR_LEN when changing TraceRecord structure */ typedef struct { unsigned long event; unsigned long x1; @@ -69,27 +69,6 @@ void trace5(TraceEventID event, unsigned long x1, unsigned long x2, unsigned lon trace(event, x1, x2, x3, x4, x5); } -void do_info_trace(Monitor *mon) -{ - unsigned int i; - - for (i = 0; i < trace_idx ; i++) { - monitor_printf(mon, "Event %lu : %lx %lx %lx %lx %lx\n", - trace_buf[i].event, trace_buf[i].x1, trace_buf[i].x2, - trace_buf[i].x3, trace_buf[i].x4, trace_buf[i].x5); - } -} - -void do_info_all_trace_events(Monitor *mon) -{ - unsigned int i; - - for (i = 0; i < NR_TRACE_EVENTS; i++) { - monitor_printf(mon, "%s [Event ID %u] : state %u\n", - trace_list[i].tp_name, i, trace_list[i].state); - } -} - static TraceEvent* find_trace_event_by_name(const char *tname) { unsigned int i; @@ -115,3 +94,30 @@ void change_trace_event_state(const char *tname, bool tstate) tp->state = tstate; } } + +/** + * Return the current trace index. + * + */ +unsigned int get_trace_idx(void) +{ + return trace_idx; +} + +/** + * returns formatted TraceRecord at a given index in the trace buffer. + * FORMAT : "Event %lu : %lx %lx %lx %lx %lx\n" + * + * @idx : index in the buffer for which trace record is returned. + * @trace_str : output string passed. + */ +char* format_trace_string(unsigned int idx, char trace_str[]) +{ + if (idx >= TRACE_BUF_LEN) { + return NULL; + } + sprintf(&trace_str[0], "Event %lu : %lx %lx %lx %lx %lx\n", + trace_buf[idx].event, trace_buf[idx].x1, trace_buf[idx].x2, + trace_buf[idx].x3, trace_buf[idx].x4, trace_buf[idx].x5); + return &trace_str[0]; +} diff --git a/tracetool b/tracetool index c77280d..b7a0499 100755 --- a/tracetool +++ b/tracetool @@ -125,6 +125,11 @@ typedef struct { bool state; } TraceEvent; +/* Max size of trace string to be displayed via the monitor. + * Format : "Event %lu : %lx %lx %lx %lx %lx\n" + */ +#define MAX_TRACE_STR_LEN 100 + void trace1(TraceEventID event, unsigned long x1); void trace2(TraceEventID event, unsigned long x1, unsigned long x2); void trace3(TraceEventID event, unsigned long x1, unsigned long x2, unsigned long x3); @@ -133,6 +138,8 @@ void trace5(TraceEventID event, unsigned long x1, unsigned long x2, unsigned lon void do_info_trace(Monitor *mon); void do_info_all_trace_events(Monitor *mon); void change_trace_event_state(const char *tname, bool tstate); +unsigned int get_trace_idx(void); +char* format_trace_string(unsigned int idx, char *trace_str); EOF simple_event_num=0 -- 1.6.2.5 -- Prerna Saxena Linux Technology Centre, IBM Systems and Technology Lab, Bangalore, India