[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 06/10] trace-state: add "-trace events" argument
From: |
Lluís |
Subject: |
[Qemu-devel] [PATCH v4 06/10] trace-state: add "-trace events" argument to control initial state |
Date: |
Tue, 03 May 2011 22:41:24 +0200 |
User-agent: |
StGit/0.15 |
The "-trace events" argument can be used to provide a file with a list of trace
event names that will be enabled prior to starting execution, thus providing
early tracing.
This saves the user from manually toggling event states through the monitor
interface or whichever backend-specific interface.
Signed-off-by: Lluís Vilanova <address@hidden>
---
docs/tracing.txt | 3 +++
qemu-config.c | 3 +++
qemu-options.hx | 24 ++++++++++++++++++------
trace/control.c | 30 ++++++++++++++++++++++++++++++
trace/control.h | 2 ++
vl.c | 2 ++
6 files changed, 58 insertions(+), 6 deletions(-)
diff --git a/docs/tracing.txt b/docs/tracing.txt
index 017ff59..8f6e5c9 100644
--- a/docs/tracing.txt
+++ b/docs/tracing.txt
@@ -129,6 +129,9 @@ This functionality is also provided through monitor
commands:
* trace-event NAME on|off
Enable/disable a given trace event.
+The "-trace events=<file>" command line argument can be used to enable the
+events listed in <file> from the very beginning of the program.
+
== Trace backends ==
The "tracetool" script automates tedious trace event code generation and also
diff --git a/qemu-config.c b/qemu-config.c
index db5b14c..318d3a1 100644
--- a/qemu-config.c
+++ b/qemu-config.c
@@ -302,6 +302,9 @@ static QemuOptsList qemu_trace_opts = {
.head = QTAILQ_HEAD_INITIALIZER(qemu_trace_opts.head),
.desc = {
{
+ .name = "events",
+ .type = QEMU_OPT_STRING,
+ },{
.name = "file",
.type = QEMU_OPT_STRING,
},
diff --git a/qemu-options.hx b/qemu-options.hx
index b439120..55d1c88 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -2357,17 +2357,29 @@ Normally QEMU loads a configuration file from
@var{sysconfdir}/qemu.conf and
option will prevent QEMU from loading these configuration files at startup.
ETEXI
DEF("trace", HAS_ARG, QEMU_OPTION_trace,
- "-trace\n"
- " Specify a trace file to log traces to\n",
+ "-trace [events=<file>][,file=<file>]\n"
+ " specify tracing options\n",
QEMU_ARCH_ALL)
STEXI
-HXCOMM This line is not accurate, as the option is backend-specific but HX does
-HXCOMM not support conditional compilation of text.
address@hidden -trace
+HXCOMM This line is not accurate, as some sub-options are backend-specific but
+HXCOMM HX does not support conditional compilation of text.
address@hidden -trace address@hidden,address@hidden
@findex -trace
-Specify a trace file to log output traces to.
+
+Specify tracing options.
+
address@hidden @option
address@hidden address@hidden
+Immediately enable events listed in @var{file}.
+The file must contain one event name (as listed in the @var{trace-events} file)
+per line.
+
+This option is not available when using the @var{nop} tracing backend.
address@hidden address@hidden
+Log output traces to @var{file}.
This option is available only when using the @var{simple} tracing backend.
address@hidden table
ETEXI
HXCOMM This is the last statement. Insert new options before this line!
diff --git a/trace/control.c b/trace/control.c
index 6138eab..0086f1f 100644
--- a/trace/control.c
+++ b/trace/control.c
@@ -34,3 +34,33 @@ bool trace_event_set_state (const char *name, bool state)
#endif
return false;
}
+
+void trace_config_event_set_state (const char *fname)
+{
+ if (fname == NULL) {
+ return;
+ }
+
+ FILE *fp = fopen(fname, "r");
+ if (!fp) {
+ fprintf(stderr, "could not open trace events file '%s': %s\n",
+ fname, strerror(errno));
+ exit(1);
+ }
+ char line_buf[1024];
+ while (fgets(line_buf, sizeof(line_buf), fp)) {
+ size_t len = strlen(line_buf);
+ if (len > 1) { /* skip empty lines */
+ line_buf[len - 1] = '\0';
+ if (!trace_event_set_state(line_buf, true)) {
+ fprintf(stderr, "qemu: error: trace event '%s' does not
exist\n", line_buf);
+ exit(1);
+ }
+ }
+ }
+ if (fclose(fp) != 0) {
+ fprintf(stderr, "qemu: error: closing file '%s': %s\n",
+ fname, strerror(errno));
+ exit(1);
+ }
+}
diff --git a/trace/control.h b/trace/control.h
index 37d3aa0..48f4b01 100644
--- a/trace/control.h
+++ b/trace/control.h
@@ -11,4 +11,6 @@
void trace_print_events (FILE *stream, fprintf_function stream_printf);
bool trace_event_set_state (const char *name, bool state);
+void trace_config_event_set_state (const char *fname);
+
#endif /* TRACE_CONTROL_H */
diff --git a/vl.c b/vl.c
index 9db7b64..ca81aee 100644
--- a/vl.c
+++ b/vl.c
@@ -156,6 +156,7 @@ int main(int argc, char **argv)
#include "slirp/libslirp.h"
#include "trace.h"
+#include "trace/control.h"
#include "trace/simple.h"
#include "qemu-queue.h"
#include "cpus.h"
@@ -2753,6 +2754,7 @@ int main(int argc, char **argv, char **envp)
fprintf(stderr, "qemu: option \"-%s\" is not supported by this
tracing backend\n", popt->name);
exit(1);
#endif
+ trace_config_event_set_state(qemu_opt_get(opts, "events"));
trace_file = qemu_opt_get(opts, "file");
#if !defined(CONFIG_SIMPLE_TRACE)
if (trace_file) {
- [Qemu-devel] [RFC][PATCH v4 00/10] trace-state: make the behaviour of "disable" consistent across all backends, Lluís, 2011/05/03
- [Qemu-devel] [PATCH v4 01/10] trace: move backend-specific code into the trace/ directory, Lluís, 2011/05/03
- [Qemu-devel] [PATCH v4 02/10] trace: avoid conditional code compilation during option parsing, Lluís, 2011/05/03
- [Qemu-devel] [PATCH v4 03/10] trace: generalize the "property" concept in the trace-events file, Lluís, 2011/05/03
- [Qemu-devel] [PATCH v4 04/10] trace-state: separate trace event control and query routines from the simple backend, Lluís, 2011/05/03
- [Qemu-devel] [PATCH v4 05/10] trace-state: always compile support for controlling and querying trace event states, Lluís, 2011/05/03
- [Qemu-devel] [PATCH v4 06/10] trace-state: add "-trace events" argument to control initial state,
Lluís <=
- [Qemu-devel] [PATCH v4 07/10] trace-state: always use the "nop" backend on events with the "disable" keyword, Lluís, 2011/05/03
- [Qemu-devel] [PATCH v4 08/10] trace-state: [simple] disable all trace points by default, Lluís, 2011/05/03
- [Qemu-devel] [PATCH v4 09/10] trace-state: [stderr] add support for dynamically enabling/disabling events, Lluís, 2011/05/03
- [Qemu-devel] [PATCH v4 10/10] trace: enable all events, Lluís, 2011/05/03
- Re: [Qemu-devel] [RFC][PATCH v4 00/10] trace-state: make the behaviour of "disable" consistent across all backends, Lluís, 2011/05/19