From patchwork Mon Aug 30 13:27:08 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 63032 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 05EF5B6EEC for ; Mon, 30 Aug 2010 23:47:08 +1000 (EST) Received: from localhost ([127.0.0.1]:42699 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Oq4hI-0007r0-Nn for incoming@patchwork.ozlabs.org; Mon, 30 Aug 2010 09:46:52 -0400 Received: from [140.186.70.92] (port=48541 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Oq4Of-0001AA-Rn for qemu-devel@nongnu.org; Mon, 30 Aug 2010 09:27:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Oq4Ob-00045T-30 for qemu-devel@nongnu.org; Mon, 30 Aug 2010 09:27:37 -0400 Received: from mtagate2.de.ibm.com ([195.212.17.162]:33903) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Oq4Oa-00044q-Pc for qemu-devel@nongnu.org; Mon, 30 Aug 2010 09:27:33 -0400 Received: from d12nrmr1607.megacenter.de.ibm.com (d12nrmr1607.megacenter.de.ibm.com [9.149.167.49]) by mtagate2.de.ibm.com (8.13.1/8.13.1) with ESMTP id o7UDRTcF024369 for ; Mon, 30 Aug 2010 13:27:29 GMT Received: from d12av04.megacenter.de.ibm.com (d12av04.megacenter.de.ibm.com [9.149.165.229]) by d12nrmr1607.megacenter.de.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id o7UDRTsO2994386 for ; Mon, 30 Aug 2010 15:27:29 +0200 Received: from d12av04.megacenter.de.ibm.com (loopback [127.0.0.1]) by d12av04.megacenter.de.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id o7UDRSk1007817 for ; Mon, 30 Aug 2010 15:27:29 +0200 Received: from stefan-thinkpad.ibm.com (sig-9-146-224-127.de.ibm.com [9.146.224.127]) by d12av04.megacenter.de.ibm.com (8.12.11.20060308/8.12.11) with ESMTP id o7UDROUO007601; Mon, 30 Aug 2010 15:27:28 +0200 From: Stefan Hajnoczi To: Date: Mon, 30 Aug 2010 14:27:08 +0100 Message-Id: <1283174836-6330-7-git-send-email-stefanha@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1283174836-6330-1-git-send-email-stefanha@linux.vnet.ibm.com> References: <1283174836-6330-1-git-send-email-stefanha@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) Cc: Blue Swirl , Anthony Liguori , Stefan Hajnoczi , Prerna Saxena Subject: [Qemu-devel] [PATCH 06/14] trace: Add trace-file command to open/close/flush trace file 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 the trace-file command: trace-file [on|off|flush] Open, close, or flush the trace file. If no argument is given, the status of the trace file is displayed. The trace file is turned on by default but is only written out when the trace buffer becomes full. The flush operation can be used to force write out at any time. Turning off the trace file does not change the state of trace events; tracing will continue to the trace buffer. When the trace file is off, use "info trace" to display the contents of the trace buffer in memory. Signed-off-by: Stefan Hajnoczi This commit also contains the trace-file sub-command from the following commit: commit 5ce8d1a957afae2c52ad748944ce72848ccf57bd Author: Prerna Saxena Date: Wed Aug 4 16:23:54 2010 +0530 trace: Add options to specify trace file name at startup and runtime This patch adds an optional command line switch '-trace' to specify the filename to write traces to, when qemu starts. Eg, If compiled with the 'simple' trace backend, [temp@system]$ qemu -trace FILENAME IMAGE Allows the binary traces to be written to FILENAME instead of the option set at config-time. Also, this adds monitor sub-command 'set' to trace-file commands to dynamically change trace log file at runtime. Eg, (qemu)trace-file set FILENAME This allows one to set trace outputs to FILENAME from the default specified at startup. Signed-off-by: Prerna Saxena Signed-off-by: Stefan Hajnoczi --- monitor.c | 23 ++++++++++++++++++++ qemu-monitor.hx | 14 ++++++++++++ simpletrace.c | 62 ++++++++++++++++++++++++++++++++++++++++++------------ simpletrace.h | 4 +++ 4 files changed, 89 insertions(+), 14 deletions(-) diff --git a/monitor.c b/monitor.c index 0e69bc8..e602480 100644 --- a/monitor.c +++ b/monitor.c @@ -549,6 +549,29 @@ static void do_change_trace_event_state(Monitor *mon, const QDict *qdict) bool new_state = qdict_get_bool(qdict, "option"); st_change_trace_event_state(tp_name, new_state); } + +static void do_trace_file(Monitor *mon, const QDict *qdict) +{ + const char *op = qdict_get_try_str(qdict, "op"); + const char *arg = qdict_get_try_str(qdict, "arg"); + + if (!op) { + st_print_trace_file_status((FILE *)mon, &monitor_fprintf); + } else if (!strcmp(op, "on")) { + st_set_trace_file_enabled(true); + } else if (!strcmp(op, "off")) { + st_set_trace_file_enabled(false); + } else if (!strcmp(op, "flush")) { + st_flush_trace_buffer(); + } else if (!strcmp(op, "set")) { + if (arg) { + st_set_trace_file(arg); + } + } else { + monitor_printf(mon, "unexpected argument \"%s\"\n", op); + help_cmd(mon, "trace-file"); + } +} #endif static void user_monitor_complete(void *opaque, QObject *ret_data) diff --git a/qemu-monitor.hx b/qemu-monitor.hx index c264c7d..49bcd8d 100644 --- a/qemu-monitor.hx +++ b/qemu-monitor.hx @@ -295,6 +295,20 @@ STEXI @findex trace-event changes status of a trace event ETEXI + + { + .name = "trace-file", + .args_type = "op:s?,arg:F?", + .params = "on|off|flush|set [arg]", + .help = "open, close, or flush trace file, or set a new file name", + .mhandler.cmd = do_trace_file, + }, + +STEXI +@item trace-file on|off|flush +@findex trace-file +Open, close, or flush the trace file. If no argument is given, the status of the trace file is displayed. +ETEXI #endif { diff --git a/simpletrace.c b/simpletrace.c index 97045a6..f849e42 100644 --- a/simpletrace.c +++ b/simpletrace.c @@ -42,6 +42,14 @@ enum { static TraceRecord trace_buf[TRACE_BUF_LEN]; static unsigned int trace_idx; static FILE *trace_fp; +static char *trace_file_name = NULL; +static bool trace_file_enabled = false; + +void st_print_trace_file_status(FILE *stream, int (*stream_printf)(FILE *stream, const char *fmt, ...)) +{ + stream_printf(stream, "Trace file \"%s\" %s.\n", + trace_file_name, trace_file_enabled ? "on" : "off"); +} static bool write_header(FILE *fp) { @@ -54,31 +62,57 @@ static bool write_header(FILE *fp) return fwrite(&header, sizeof header, 1, fp) == 1; } -static bool open_trace_file(void) +/** + * set_trace_file : To set the name of a trace file. + * @file : pointer to the name to be set. + * If NULL, set to the default name- set at config time. + */ +bool st_set_trace_file(const char *file) { - char *filename; + st_set_trace_file_enabled(false); - if (asprintf(&filename, CONFIG_TRACE_FILE, getpid()) < 0) { - return false; - } + free(trace_file_name); - trace_fp = fopen(filename, "w"); - free(filename); - if (!trace_fp) { - return false; + if (!file) { + if (asprintf(&trace_file_name, CONFIG_TRACE_FILE, getpid()) < 0) { + trace_file_name = NULL; + return false; + } + } else { + if (asprintf(&trace_file_name, "%s", file) < 0) { + trace_file_name = NULL; + return false; + } } - return write_header(trace_fp); + + st_set_trace_file_enabled(true); + return true; } -static void flush_trace_buffer(void) +static void flush_trace_file(void) { + /* If the trace file is not open yet, open it now */ if (!trace_fp) { - open_trace_file(); + trace_fp = fopen(trace_file_name, "w"); + if (!trace_fp) { + /* Avoid repeatedly trying to open file on failure */ + trace_file_enabled = false; + return; + } + write_header(trace_fp); } + if (trace_fp) { size_t unused; /* for when fwrite(3) is declared warn_unused_result */ unused = fwrite(trace_buf, trace_idx * sizeof(trace_buf[0]), 1, trace_fp); } +} + +void st_flush_trace_buffer(void) +{ + if (trace_file_enabled) { + flush_trace_file(); + } /* Discard written trace records */ trace_idx = 0; @@ -128,7 +162,7 @@ static void trace(TraceEventID event, uint64_t x1, uint64_t x2, uint64_t x3, rec->x6 = x6; if (++trace_idx == TRACE_BUF_LEN) { - flush_trace_buffer(); + st_flush_trace_buffer(); } } diff --git a/simpletrace.h b/simpletrace.h index b0161d1..cf35897 100644 --- a/simpletrace.h +++ b/simpletrace.h @@ -32,5 +32,9 @@ void trace6(TraceEventID event, uint64_t x1, uint64_t x2, uint64_t x3, uint64_t void st_print_trace(FILE *stream, int (*stream_printf)(FILE *stream, const char *fmt, ...)); void st_print_trace_events(FILE *stream, int (*stream_printf)(FILE *stream, const char *fmt, ...)); void st_change_trace_event_state(const char *tname, bool tstate); +void st_print_trace_file_status(FILE *stream, int (*stream_printf)(FILE *stream, const char *fmt, ...)); +void st_set_trace_file_enabled(bool enable); +bool st_set_trace_file(const char *file); +void st_flush_trace_buffer(void); #endif /* SIMPLETRACE_H */