* [Qemu-devel] [PATCH v3 00/18] Refactor trace to allow modular build
@ 2016-09-19 14:48 Daniel P. Berrange
2016-09-19 14:48 ` [Qemu-devel] [PATCH v3 01/18] trace: add trace event iterator APIs Daniel P. Berrange
` (19 more replies)
0 siblings, 20 replies; 48+ messages in thread
From: Daniel P. Berrange @ 2016-09-19 14:48 UTC (permalink / raw)
To: qemu-devel; +Cc: Stefan Hajnoczi, Lluís Vilanova, Daniel P. Berrange
These patches were previously posted as part of my giant
trace events modular build series
v1: https://lists.gnu.org/archive/html/qemu-devel/2016-08/msg01714.html
v2: https://lists.gnu.org/archive/html/qemu-devel/2016-09/msg03335.html
This series does all the refactoring required to support a fully
modular build of the trace probe points, but does not actually
convert anything to use it. The 40+ patches to convert each subdir
to use modular build will only be posted again, once the refactoring
is reviewed & queued, in order to avoid patch-bombing the list
more than is needed. The full series is visible at
https://github.com/berrange/qemu/tree/trace-events-3
The key problem being tackled by this series is the assumption
that there is a single statically declared enum which provides
globally unique event IDs. Inside QEMU the event IDs were used
as list indexes into the 'trace_events' array, while the event
VCPU IDs were used as bitmap indexes in trace_dstate against
the CPUState struct. Externally to QEMU, the event IDs were
also written in the simpletrace binary data format and used
to lookup the entry in the trace-events file afterwards.
Inside QEMU the refactoring work managed to remove all need
for event IDs for purposes of 'trace_events' array lookups.
Instead we now have global variables per-event which can be
referenced directly.
When QEMU starts up and the various event groups are registered,
we now dynamically assign event IDs and VCPU IDs to each event.
This removes the limitation in the v1 posting that all vCPU
events had to be in one file. We also removed the limitation
on the total number of vCPU events. So there is no regression
in functionality of VCPU event support compared to current
GIT master.
Since the event IDs are allocated dynamically at runtime,
the simpletrace.py script cannot assume they map directly
to the 'trace-events' file entries. Thus, the simpletrace
binary format is extended to include a record type that
maps trace event IDs to trace event names. While it would
be possible to take this even further and make the
simpletrace binary format 100% self-describing this is left
as an exercise for future developers, as it is not a
pre-requisite for this modular build.
While some of the intermediate patches may seem pointless
on their own, they exist in order to facilitate the review
of later patches by ensuring each patch does the minimum
possible refactoring work.
Changed in v3:
- Change simpletrace format to write a mapping of
IDs to names
- Declare a TraceEvent variable per event, instead
of just an array
- Make 'trace_events' array be 'TraceEvent **'
instead of 'TraceEvent *'
- Fix infinite loop in iterators due to bad
fix in v2 posting.
- Dynamically allocate the trace_dstate variable
in CPUState based on actual number of vcpu events
registered at runtime
- Push logic for determining group name into the
tracetool program
- Fix to ftrace to make it more practical for users
who sometimes run QEMU as non-root.
- Get rid of TraceEventID/VCPUID enums entirely
Changed in v2:
- Fixed filtering of events on first call of
iterator_next (Stefan)
- Switch from size_t to uint32_t for event ID
type (Paolo/Stefan)
- Replace global 'dstate' array with individual
variables (Lluís)
Daniel P. Berrange (18):
trace: add trace event iterator APIs
trace: convert code to use event iterators
trace: remove some now unused functions
trace: remove global 'uint16 dstate[]' array
trace: remove duplicate control.h includes in generated-tracers.h
trace: break circular dependancy in event-internal.h
trace: give each trace event a named TraceEvent struct
trace: remove the TraceEventID and TraceEventVCPUID enums
trace: emit name <-> ID mapping in simpletrace header
trace: don't abort qemu if ftrace can't be initialized
trace: provide mechanism for registering trace events
trace: dynamically allocate trace_dstate in CPUState
trace: dynamically allocate event IDs at runtime
trace: get rid of generated-events.h/generated-events.c
trace: rename _read_events to read_events
trace: push reading of events up a level to tracetool main
trace: pass trace-events to tracetool as a positional param
trace: introduce a formal group name for trace events
Makefile | 3 -
Makefile.target | 6 +-
include/qemu/module.h | 2 +
include/qom/cpu.h | 7 +-
include/trace-tcg.h | 1 -
include/trace.h | 1 -
monitor.c | 26 +++--
qemu-img.c | 1 +
qemu-io.c | 1 +
qemu-nbd.c | 1 +
qom/cpu.c | 7 +-
scripts/simpletrace.py | 55 ++++++---
scripts/tracetool.py | 29 ++++-
scripts/tracetool/__init__.py | 27 +++--
scripts/tracetool/backend/__init__.py | 12 +-
scripts/tracetool/backend/dtrace.py | 4 +-
scripts/tracetool/backend/ftrace.py | 6 +-
scripts/tracetool/backend/log.py | 7 +-
scripts/tracetool/backend/simple.py | 10 +-
scripts/tracetool/backend/syslog.py | 5 +-
scripts/tracetool/backend/ust.py | 4 +-
scripts/tracetool/format/__init__.py | 4 +-
scripts/tracetool/format/c.py | 57 +++++++--
scripts/tracetool/format/d.py | 2 +-
scripts/tracetool/format/events_c.py | 37 ++++--
scripts/tracetool/format/events_h.py | 24 +---
scripts/tracetool/format/h.py | 36 ++++--
scripts/tracetool/format/simpletrace_stap.py | 25 +++-
scripts/tracetool/format/stap.py | 2 +-
scripts/tracetool/format/tcg_h.py | 2 +-
scripts/tracetool/format/tcg_helper_c.py | 2 +-
scripts/tracetool/format/tcg_helper_h.py | 2 +-
scripts/tracetool/format/tcg_helper_wrapper_h.py | 2 +-
scripts/tracetool/format/ust_events_c.py | 2 +-
scripts/tracetool/format/ust_events_h.py | 8 +-
stubs/trace-control.c | 9 +-
trace/Makefile.objs | 46 +++-----
trace/control-internal.h | 45 +++-----
trace/control-target.c | 22 ++--
trace/control.c | 141 +++++++++++++++--------
trace/control.h | 110 ++++++------------
trace/event-internal.h | 17 ++-
trace/ftrace.c | 6 +
trace/qmp.c | 16 ++-
trace/simple.c | 38 +++++-
trace/simple.h | 6 +-
vl.c | 2 +
47 files changed, 520 insertions(+), 358 deletions(-)
--
2.7.4
^ permalink raw reply [flat|nested] 48+ messages in thread
* [Qemu-devel] [PATCH v3 01/18] trace: add trace event iterator APIs
2016-09-19 14:48 [Qemu-devel] [PATCH v3 00/18] Refactor trace to allow modular build Daniel P. Berrange
@ 2016-09-19 14:48 ` Daniel P. Berrange
2016-09-19 16:39 ` Lluís Vilanova
2016-09-19 14:48 ` [Qemu-devel] [PATCH v3 02/18] trace: convert code to use event iterators Daniel P. Berrange
` (18 subsequent siblings)
19 siblings, 1 reply; 48+ messages in thread
From: Daniel P. Berrange @ 2016-09-19 14:48 UTC (permalink / raw)
To: qemu-devel; +Cc: Stefan Hajnoczi, Lluís Vilanova, Daniel P. Berrange
Currently methods which want to iterate over trace events,
do so using the trace_event_count() and trace_event_id()
methods. This leaks the concept of a single ID enum to
the callers. There is an alternative trace_event_pattern()
method which can be used in an iteration context, but its
design is stateless, so is not easy to expand it in the
future.
This defines a formal iterator API will provide an future
proof way of iterating over events.
The iterator is also able to apply a pattern match filter
to events, further removing the need for the pattern
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
trace/control.c | 21 +++++++++++++++++++++
trace/control.h | 27 +++++++++++++++++++++++++++
2 files changed, 48 insertions(+)
diff --git a/trace/control.c b/trace/control.c
index 05d85ac..1a96049 100644
--- a/trace/control.c
+++ b/trace/control.c
@@ -125,6 +125,27 @@ TraceEvent *trace_event_pattern(const char *pat, TraceEvent *ev)
return NULL;
}
+void trace_event_iter_init(TraceEventIter *iter, const char *pattern)
+{
+ iter->event = 0;
+ iter->pattern = pattern;
+}
+
+TraceEvent *trace_event_iter_next(TraceEventIter *iter)
+{
+ while (iter->event < TRACE_EVENT_COUNT) {
+ TraceEvent *ev = &(trace_events[iter->event]);
+ iter->event++;
+ if (!iter->pattern ||
+ pattern_glob(iter->pattern,
+ trace_event_get_name(ev))) {
+ return ev;
+ }
+ }
+
+ return NULL;
+}
+
void trace_list_events(void)
{
int i;
diff --git a/trace/control.h b/trace/control.h
index 27a16fc..c71b405 100644
--- a/trace/control.h
+++ b/trace/control.h
@@ -13,6 +13,10 @@
#include "qemu-common.h"
#include "trace/generated-events.h"
+typedef struct TraceEventIter {
+ size_t event;
+ const char *pattern;
+} TraceEventIter;
/**
* TraceEventID:
@@ -25,6 +29,29 @@
*/
enum TraceEventID;
+
+/**
+ * trace_event_iter_init:
+ * @iter: the event iterator struct
+ * @pattern: optional pattern to filter events on name
+ *
+ * Initialize the event iterator struct @iter,
+ * optionally using @pattern to filter out events
+ * with non-matching names.
+ */
+void trace_event_iter_init(TraceEventIter *iter, const char *pattern);
+
+/**
+ * trace_event_iter_next:
+ * @iter: the event iterator struct
+ *
+ * Get the next event, if any. When this returns NULL,
+ * the iterator should no longer be used.
+ *
+ * Returns: the next event, or NULL if no more events exist
+ */
+TraceEvent *trace_event_iter_next(TraceEventIter *iter);
+
/**
* trace_event_id:
* @id: Event identifier.
--
2.7.4
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [Qemu-devel] [PATCH v3 02/18] trace: convert code to use event iterators
2016-09-19 14:48 [Qemu-devel] [PATCH v3 00/18] Refactor trace to allow modular build Daniel P. Berrange
2016-09-19 14:48 ` [Qemu-devel] [PATCH v3 01/18] trace: add trace event iterator APIs Daniel P. Berrange
@ 2016-09-19 14:48 ` Daniel P. Berrange
2016-09-19 16:59 ` Lluís Vilanova
2016-09-19 14:48 ` [Qemu-devel] [PATCH v3 03/18] trace: remove some now unused functions Daniel P. Berrange
` (17 subsequent siblings)
19 siblings, 1 reply; 48+ messages in thread
From: Daniel P. Berrange @ 2016-09-19 14:48 UTC (permalink / raw)
To: qemu-devel; +Cc: Stefan Hajnoczi, Lluís Vilanova, Daniel P. Berrange
This converts the HMP/QMP monitor API implementations
and some internal trace control methods to use the new
trace event iterator APIs.
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
monitor.c | 26 ++++++++--------
trace/control.c | 92 +++++++++++++++++++++++++++++++++------------------------
trace/qmp.c | 16 ++++++----
3 files changed, 78 insertions(+), 56 deletions(-)
diff --git a/monitor.c b/monitor.c
index 5c00373..ae70157 100644
--- a/monitor.c
+++ b/monitor.c
@@ -3335,13 +3335,14 @@ void info_trace_events_completion(ReadLineState *rs, int nb_args, const char *st
len = strlen(str);
readline_set_completion_index(rs, len);
if (nb_args == 2) {
- TraceEventID id;
- for (id = 0; id < trace_event_count(); id++) {
- const char *event_name = trace_event_get_name(trace_event_id(id));
- if (!strncmp(str, event_name, len)) {
- readline_add_completion(rs, event_name);
- }
+ TraceEventIter iter;
+ TraceEvent *ev;
+ char *pattern = g_strdup_printf("%s*", str);
+ trace_event_iter_init(&iter, pattern);
+ while ((ev = trace_event_iter_next(&iter)) != NULL) {
+ readline_add_completion(rs, trace_event_get_name(ev));
}
+ g_free(pattern);
}
}
@@ -3352,13 +3353,14 @@ void trace_event_completion(ReadLineState *rs, int nb_args, const char *str)
len = strlen(str);
readline_set_completion_index(rs, len);
if (nb_args == 2) {
- TraceEventID id;
- for (id = 0; id < trace_event_count(); id++) {
- const char *event_name = trace_event_get_name(trace_event_id(id));
- if (!strncmp(str, event_name, len)) {
- readline_add_completion(rs, event_name);
- }
+ TraceEventIter iter;
+ TraceEvent *ev;
+ char *pattern = g_strdup_printf("%s*", str);
+ trace_event_iter_init(&iter, pattern);
+ while ((ev = trace_event_iter_next(&iter)) != NULL) {
+ readline_add_completion(rs, trace_event_get_name(ev));
}
+ g_free(pattern);
} else if (nb_args == 3) {
add_completion_option(rs, str, "on");
add_completion_option(rs, str, "off");
diff --git a/trace/control.c b/trace/control.c
index 1a96049..b471146 100644
--- a/trace/control.c
+++ b/trace/control.c
@@ -60,9 +60,10 @@ TraceEvent *trace_event_name(const char *name)
{
assert(name != NULL);
- TraceEventID i;
- for (i = 0; i < trace_event_count(); i++) {
- TraceEvent *ev = trace_event_id(i);
+ TraceEventIter iter;
+ TraceEvent *ev;
+ trace_event_iter_init(&iter, NULL);
+ while ((ev = trace_event_iter_next(&iter)) != NULL) {
if (strcmp(trace_event_get_name(ev), name) == 0) {
return ev;
}
@@ -105,21 +106,18 @@ TraceEvent *trace_event_pattern(const char *pat, TraceEvent *ev)
{
assert(pat != NULL);
- TraceEventID i;
-
- if (ev == NULL) {
- i = -1;
- } else {
- i = trace_event_get_id(ev);
- }
- i++;
-
- while (i < trace_event_count()) {
- TraceEvent *res = trace_event_id(i);
- if (pattern_glob(pat, trace_event_get_name(res))) {
- return res;
+ bool matched = ev ? false : true;
+ TraceEventIter iter;
+ TraceEvent *thisev;
+ trace_event_iter_init(&iter, pat);
+ while ((thisev = trace_event_iter_next(&iter)) != NULL) {
+ if (matched) {
+ return thisev;
+ } else {
+ if (ev == thisev) {
+ matched = true;
+ }
}
- i++;
}
return NULL;
@@ -148,10 +146,11 @@ TraceEvent *trace_event_iter_next(TraceEventIter *iter)
void trace_list_events(void)
{
- int i;
- for (i = 0; i < trace_event_count(); i++) {
- TraceEvent *res = trace_event_id(i);
- fprintf(stderr, "%s\n", trace_event_get_name(res));
+ TraceEventIter iter;
+ TraceEvent *ev;
+ trace_event_iter_init(&iter, NULL);
+ while ((ev = trace_event_iter_next(&iter)) != NULL) {
+ fprintf(stderr, "%s\n", trace_event_get_name(ev));
}
}
@@ -159,25 +158,40 @@ static void do_trace_enable_events(const char *line_buf)
{
const bool enable = ('-' != line_buf[0]);
const char *line_ptr = enable ? line_buf : line_buf + 1;
-
- if (trace_event_is_pattern(line_ptr)) {
- TraceEvent *ev = NULL;
- while ((ev = trace_event_pattern(line_ptr, ev)) != NULL) {
+ TraceEventIter iter;
+ TraceEvent *ev;
+ bool is_pattern = trace_event_is_pattern(line_ptr);
+
+ trace_event_iter_init(&iter, is_pattern ? line_ptr : NULL);
+ while ((ev = trace_event_iter_next(&iter)) != NULL) {
+ bool match = false;
+ if (is_pattern) {
if (trace_event_get_state_static(ev)) {
- trace_event_set_state_dynamic_init(ev, enable);
+ match = true;
}
- }
- } else {
- TraceEvent *ev = trace_event_name(line_ptr);
- if (ev == NULL) {
- error_report("WARNING: trace event '%s' does not exist",
- line_ptr);
- } else if (!trace_event_get_state_static(ev)) {
- error_report("WARNING: trace event '%s' is not traceable",
- line_ptr);
} else {
- trace_event_set_state_dynamic_init(ev, enable);
+ if (g_str_equal(trace_event_get_name(ev),
+ line_ptr)) {
+ if (!trace_event_get_state_static(ev)) {
+ error_report("WARNING: trace event '%s' is not traceable",
+ line_ptr);
+ return;
+ }
+ match = true;
+ }
}
+ if (match) {
+ /* start tracing */
+ trace_event_set_state_dynamic(ev, enable);
+ if (!is_pattern) {
+ return;
+ }
+ }
+ }
+
+ if (!is_pattern) {
+ error_report("WARNING: trace event '%s' does not exist",
+ line_ptr);
}
}
@@ -293,8 +307,10 @@ char *trace_opt_parse(const char *optarg)
void trace_init_vcpu_events(void)
{
- TraceEvent *ev = NULL;
- while ((ev = trace_event_pattern("*", ev)) != NULL) {
+ TraceEventIter iter;
+ TraceEvent *ev;
+ trace_event_iter_init(&iter, NULL);
+ while ((ev = trace_event_iter_next(&iter)) != NULL) {
if (trace_event_is_vcpu(ev) &&
trace_event_get_state_static(ev) &&
trace_event_get_state_dynamic(ev)) {
diff --git a/trace/qmp.c b/trace/qmp.c
index 11d2564..88a907b 100644
--- a/trace/qmp.c
+++ b/trace/qmp.c
@@ -52,8 +52,10 @@ static bool check_events(bool has_vcpu, bool ignore_unavailable, bool is_pattern
return true;
} else {
/* error for unavailable events */
- TraceEvent *ev = NULL;
- while ((ev = trace_event_pattern(name, ev)) != NULL) {
+ TraceEventIter iter;
+ TraceEvent *ev;
+ trace_event_iter_init(&iter, name);
+ while ((ev = trace_event_iter_next(&iter)) != NULL) {
if (!ignore_unavailable && !trace_event_get_state_static(ev)) {
error_setg(errp, "event \"%s\" is disabled", trace_event_get_name(ev));
return false;
@@ -69,6 +71,7 @@ TraceEventInfoList *qmp_trace_event_get_state(const char *name,
{
Error *err = NULL;
TraceEventInfoList *events = NULL;
+ TraceEventIter iter;
TraceEvent *ev;
bool is_pattern = trace_event_is_pattern(name);
CPUState *cpu;
@@ -86,8 +89,8 @@ TraceEventInfoList *qmp_trace_event_get_state(const char *name,
}
/* Get states (all errors checked above) */
- ev = NULL;
- while ((ev = trace_event_pattern(name, ev)) != NULL) {
+ trace_event_iter_init(&iter, is_pattern ? name : NULL);
+ while ((ev = trace_event_iter_next(&iter)) != NULL) {
TraceEventInfoList *elem;
bool is_vcpu = trace_event_is_vcpu(ev);
if (has_vcpu && !is_vcpu) {
@@ -132,6 +135,7 @@ void qmp_trace_event_set_state(const char *name, bool enable,
Error **errp)
{
Error *err = NULL;
+ TraceEventIter iter;
TraceEvent *ev;
bool is_pattern = trace_event_is_pattern(name);
CPUState *cpu;
@@ -150,8 +154,8 @@ void qmp_trace_event_set_state(const char *name, bool enable,
}
/* Apply changes (all errors checked above) */
- ev = NULL;
- while ((ev = trace_event_pattern(name, ev)) != NULL) {
+ trace_event_iter_init(&iter, name);
+ while ((ev = trace_event_iter_next(&iter)) != NULL) {
if (!trace_event_get_state_static(ev) ||
(has_vcpu && !trace_event_is_vcpu(ev))) {
continue;
--
2.7.4
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [Qemu-devel] [PATCH v3 03/18] trace: remove some now unused functions
2016-09-19 14:48 [Qemu-devel] [PATCH v3 00/18] Refactor trace to allow modular build Daniel P. Berrange
2016-09-19 14:48 ` [Qemu-devel] [PATCH v3 01/18] trace: add trace event iterator APIs Daniel P. Berrange
2016-09-19 14:48 ` [Qemu-devel] [PATCH v3 02/18] trace: convert code to use event iterators Daniel P. Berrange
@ 2016-09-19 14:48 ` Daniel P. Berrange
2016-09-19 17:00 ` Lluís Vilanova
2016-09-19 14:48 ` [Qemu-devel] [PATCH v3 04/18] trace: remove global 'uint16 dstate[]' array Daniel P. Berrange
` (16 subsequent siblings)
19 siblings, 1 reply; 48+ messages in thread
From: Daniel P. Berrange @ 2016-09-19 14:48 UTC (permalink / raw)
To: qemu-devel; +Cc: Stefan Hajnoczi, Lluís Vilanova, Daniel P. Berrange
The trace_event_count, trace_event_id and
trace_event_pattern methods are no longer required
now that everything is using the iterator APIs
The trace_event_set_state and trace_event_set_vcpu_state
macros were also unused.
Reviewed-by: Lluís Vilanova <vilanova@ac.upc.edu>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
trace/control-internal.h | 11 ---------
trace/control.c | 20 ----------------
trace/control.h | 59 ------------------------------------------------
3 files changed, 90 deletions(-)
diff --git a/trace/control-internal.h b/trace/control-internal.h
index a4e5f4a..7f31e39 100644
--- a/trace/control-internal.h
+++ b/trace/control-internal.h
@@ -20,17 +20,6 @@ extern uint16_t trace_events_dstate[];
extern int trace_events_enabled_count;
-static inline TraceEventID trace_event_count(void)
-{
- return TRACE_EVENT_COUNT;
-}
-
-static inline TraceEvent *trace_event_id(TraceEventID id)
-{
- assert(id < trace_event_count());
- return &trace_events[id];
-}
-
static inline bool trace_event_is_pattern(const char *str)
{
assert(str != NULL);
diff --git a/trace/control.c b/trace/control.c
index b471146..303b3f3 100644
--- a/trace/control.c
+++ b/trace/control.c
@@ -102,26 +102,6 @@ static bool pattern_glob(const char *pat, const char *ev)
}
}
-TraceEvent *trace_event_pattern(const char *pat, TraceEvent *ev)
-{
- assert(pat != NULL);
-
- bool matched = ev ? false : true;
- TraceEventIter iter;
- TraceEvent *thisev;
- trace_event_iter_init(&iter, pat);
- while ((thisev = trace_event_iter_next(&iter)) != NULL) {
- if (matched) {
- return thisev;
- } else {
- if (ev == thisev) {
- matched = true;
- }
- }
- }
-
- return NULL;
-}
void trace_event_iter_init(TraceEventIter *iter, const char *pattern)
{
diff --git a/trace/control.h b/trace/control.h
index c71b405..e80c220 100644
--- a/trace/control.h
+++ b/trace/control.h
@@ -52,21 +52,6 @@ void trace_event_iter_init(TraceEventIter *iter, const char *pattern);
*/
TraceEvent *trace_event_iter_next(TraceEventIter *iter);
-/**
- * trace_event_id:
- * @id: Event identifier.
- *
- * Get an event by its identifier.
- *
- * This routine has a constant cost, as opposed to trace_event_name and
- * trace_event_pattern.
- *
- * Pre-conditions: The identifier is valid.
- *
- * Returns: pointer to #TraceEvent.
- *
- */
-static TraceEvent *trace_event_id(TraceEventID id);
/**
* trace_event_name:
@@ -79,31 +64,12 @@ static TraceEvent *trace_event_id(TraceEventID id);
TraceEvent *trace_event_name(const char *name);
/**
- * trace_event_pattern:
- * @pat: Event name pattern.
- * @ev: Event to start searching from (not included).
- *
- * Get all events with a given name pattern.
- *
- * Returns: pointer to #TraceEvent or NULL if not found.
- */
-TraceEvent *trace_event_pattern(const char *pat, TraceEvent *ev);
-
-/**
* trace_event_is_pattern:
*
* Whether the given string is an event name pattern.
*/
static bool trace_event_is_pattern(const char *str);
-/**
- * trace_event_count:
- *
- * Return the number of events.
- */
-static TraceEventID trace_event_count(void);
-
-
/**
* trace_event_get_id:
@@ -194,31 +160,6 @@ static bool trace_event_get_state_dynamic(TraceEvent *ev);
*/
static bool trace_event_get_vcpu_state_dynamic(CPUState *vcpu, TraceEvent *ev);
-/**
- * trace_event_set_state:
- *
- * Set the tracing state of an event (only if possible).
- */
-#define trace_event_set_state(id, state) \
- do { \
- if ((id ##_ENABLED)) { \
- TraceEvent *_e = trace_event_id(id); \
- trace_event_set_state_dynamic(_e, state); \
- } \
- } while (0)
-
-/**
- * trace_event_set_vcpu_state:
- *
- * Set the tracing state of an event for the given vCPU (only if not disabled).
- */
-#define trace_event_set_vcpu_state(vcpu, id, state) \
- do { \
- if ((id ##_ENABLED)) { \
- TraceEvent *_e = trace_event_id(id); \
- trace_event_set_vcpu_state_dynamic(vcpu, _e, state); \
- } \
- } while (0)
/**
* trace_event_set_state_dynamic:
--
2.7.4
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [Qemu-devel] [PATCH v3 04/18] trace: remove global 'uint16 dstate[]' array
2016-09-19 14:48 [Qemu-devel] [PATCH v3 00/18] Refactor trace to allow modular build Daniel P. Berrange
` (2 preceding siblings ...)
2016-09-19 14:48 ` [Qemu-devel] [PATCH v3 03/18] trace: remove some now unused functions Daniel P. Berrange
@ 2016-09-19 14:48 ` Daniel P. Berrange
2016-09-19 15:55 ` Eric Blake
2016-09-19 17:05 ` Lluís Vilanova
2016-09-19 14:48 ` [Qemu-devel] [PATCH v3 05/18] trace: remove duplicate control.h includes in generated-tracers.h Daniel P. Berrange
` (15 subsequent siblings)
19 siblings, 2 replies; 48+ messages in thread
From: Daniel P. Berrange @ 2016-09-19 14:48 UTC (permalink / raw)
To: qemu-devel; +Cc: Stefan Hajnoczi, Lluís Vilanova, Daniel P. Berrange
Instead of having a global dstate array, declare a single
'uint16 TRACE_${EVENT_NAME}_DSTATE' variable for each
trace event. Record a pointer to this variable in the
TraceEvent struct too.
By turning trace_event_get_state_dynamic_by_id into a
macro, this still hits the fast path, and cache affinity
is ensured by declaring all the uint16 vars adjacent to
each other.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
scripts/tracetool/__init__.py | 3 ++-
scripts/tracetool/format/events_c.py | 9 +++++++--
scripts/tracetool/format/events_h.py | 3 +++
stubs/trace-control.c | 9 ++++-----
trace/control-internal.h | 14 ++++----------
trace/control-target.c | 20 ++++++++------------
trace/control.c | 11 ++---------
trace/event-internal.h | 6 ++++++
8 files changed, 36 insertions(+), 39 deletions(-)
diff --git a/scripts/tracetool/__init__.py b/scripts/tracetool/__init__.py
index be24039..5191df9 100644
--- a/scripts/tracetool/__init__.py
+++ b/scripts/tracetool/__init__.py
@@ -265,11 +265,12 @@ class Event(object):
QEMU_TRACE = "trace_%(name)s"
QEMU_TRACE_TCG = QEMU_TRACE + "_tcg"
+ QEMU_DSTATE = "___TRACE_%(NAME)s_DSTATE"
def api(self, fmt=None):
if fmt is None:
fmt = Event.QEMU_TRACE
- return fmt % {"name": self.name}
+ return fmt % {"name": self.name, "NAME": self.name.upper()}
def transform(self, *trans):
"""Return a new Event with transformed Arguments."""
diff --git a/scripts/tracetool/format/events_c.py b/scripts/tracetool/format/events_c.py
index 4012063..ef873fa 100644
--- a/scripts/tracetool/format/events_c.py
+++ b/scripts/tracetool/format/events_c.py
@@ -25,6 +25,9 @@ def generate(events, backend):
'#include "trace/control.h"',
'')
+ for e in events:
+ out('uint16_t %s;' % e.api(e.QEMU_DSTATE))
+
out('TraceEvent trace_events[TRACE_EVENT_COUNT] = {')
for e in events:
@@ -34,11 +37,13 @@ def generate(events, backend):
vcpu_id = "TRACE_VCPU_EVENT_COUNT"
out(' { .id = %(id)s, .vcpu_id = %(vcpu_id)s,'
' .name = \"%(name)s\",'
- ' .sstate = %(sstate)s },',
+ ' .sstate = %(sstate)s,',
+ ' .dstate = &%(dstate)s, }, ',
id = "TRACE_" + e.name.upper(),
vcpu_id = vcpu_id,
name = e.name,
- sstate = "TRACE_%s_ENABLED" % e.name.upper())
+ sstate = "TRACE_%s_ENABLED" % e.name.upper(),
+ dstate = e.api(e.QEMU_DSTATE))
out('};',
'')
diff --git a/scripts/tracetool/format/events_h.py b/scripts/tracetool/format/events_h.py
index a9da60b..03417de 100644
--- a/scripts/tracetool/format/events_h.py
+++ b/scripts/tracetool/format/events_h.py
@@ -32,6 +32,9 @@ def generate(events, backend):
out(' TRACE_EVENT_COUNT',
'} TraceEventID;')
+ for e in events:
+ out('extern uint16_t %s;' % e.api(e.QEMU_DSTATE))
+
# per-vCPU event identifiers
out('typedef enum {')
diff --git a/stubs/trace-control.c b/stubs/trace-control.c
index 2dfcd9f..dd68f25 100644
--- a/stubs/trace-control.c
+++ b/stubs/trace-control.c
@@ -18,22 +18,21 @@ void trace_event_set_state_dynamic_init(TraceEvent *ev, bool state)
void trace_event_set_state_dynamic(TraceEvent *ev, bool state)
{
- TraceEventID id;
bool state_pre;
assert(trace_event_get_state_static(ev));
- id = trace_event_get_id(ev);
+
/*
* We ignore the "vcpu" property here, since there's no target code. Then
* dstate can only be 1 or 0.
*/
- state_pre = trace_events_dstate[id];
+ state_pre = *(ev->dstate);
if (state_pre != state) {
if (state) {
trace_events_enabled_count++;
- trace_events_dstate[id] = 1;
+ *(ev->dstate) = 1;
} else {
trace_events_enabled_count--;
- trace_events_dstate[id] = 0;
+ *(ev->dstate) = 0;
}
}
}
diff --git a/trace/control-internal.h b/trace/control-internal.h
index 7f31e39..828c1fc 100644
--- a/trace/control-internal.h
+++ b/trace/control-internal.h
@@ -16,7 +16,6 @@
extern TraceEvent trace_events[];
-extern uint16_t trace_events_dstate[];
extern int trace_events_enabled_count;
@@ -54,18 +53,13 @@ static inline bool trace_event_get_state_static(TraceEvent *ev)
return ev->sstate;
}
-static inline bool trace_event_get_state_dynamic_by_id(TraceEventID id)
-{
- /* it's on fast path, avoid consistency checks (asserts) */
- return unlikely(trace_events_enabled_count) && trace_events_dstate[id];
-}
+/* it's on fast path, avoid consistency checks (asserts) */
+#define trace_event_get_state_dynamic_by_id(id) \
+ (unlikely(trace_events_enabled_count) && ___ ## id ## _DSTATE)
static inline bool trace_event_get_state_dynamic(TraceEvent *ev)
{
- TraceEventID id;
- assert(trace_event_get_state_static(ev));
- id = trace_event_get_id(ev);
- return trace_event_get_state_dynamic_by_id(id);
+ return unlikely(trace_events_enabled_count) && *ev->dstate;
}
static inline bool trace_event_get_vcpu_state_dynamic_by_vcpu_id(CPUState *vcpu,
diff --git a/trace/control-target.c b/trace/control-target.c
index 72081e2..c69dda9 100644
--- a/trace/control-target.c
+++ b/trace/control-target.c
@@ -15,21 +15,20 @@
void trace_event_set_state_dynamic_init(TraceEvent *ev, bool state)
{
- TraceEventID id = trace_event_get_id(ev);
bool state_pre;
assert(trace_event_get_state_static(ev));
/*
* We ignore the "vcpu" property here, since no vCPUs have been created
* yet. Then dstate can only be 1 or 0.
*/
- state_pre = trace_events_dstate[id];
+ state_pre = *ev->dstate;
if (state_pre != state) {
if (state) {
trace_events_enabled_count++;
- trace_events_dstate[id] = 1;
+ *ev->dstate = 1;
} else {
trace_events_enabled_count--;
- trace_events_dstate[id] = 0;
+ *ev->dstate = 0;
}
}
}
@@ -44,15 +43,14 @@ void trace_event_set_state_dynamic(TraceEvent *ev, bool state)
}
} else {
/* Without the "vcpu" property, dstate can only be 1 or 0 */
- TraceEventID id = trace_event_get_id(ev);
- bool state_pre = trace_events_dstate[id];
+ bool state_pre = *ev->dstate;
if (state_pre != state) {
if (state) {
trace_events_enabled_count++;
- trace_events_dstate[id] = 1;
+ *ev->dstate = 1;
} else {
trace_events_enabled_count--;
- trace_events_dstate[id] = 0;
+ *ev->dstate = 0;
}
}
}
@@ -61,23 +59,21 @@ void trace_event_set_state_dynamic(TraceEvent *ev, bool state)
void trace_event_set_vcpu_state_dynamic(CPUState *vcpu,
TraceEvent *ev, bool state)
{
- TraceEventID id;
TraceEventVCPUID vcpu_id;
bool state_pre;
assert(trace_event_get_state_static(ev));
assert(trace_event_is_vcpu(ev));
- id = trace_event_get_id(ev);
vcpu_id = trace_event_get_vcpu_id(ev);
state_pre = test_bit(vcpu_id, vcpu->trace_dstate);
if (state_pre != state) {
if (state) {
trace_events_enabled_count++;
set_bit(vcpu_id, vcpu->trace_dstate);
- trace_events_dstate[id]++;
+ (*ev->dstate)++;
} else {
trace_events_enabled_count--;
clear_bit(vcpu_id, vcpu->trace_dstate);
- trace_events_dstate[id]--;
+ (*ev->dstate)--;
}
}
}
diff --git a/trace/control.c b/trace/control.c
index 303b3f3..c681fa0 100644
--- a/trace/control.c
+++ b/trace/control.c
@@ -28,12 +28,6 @@
#include "monitor/monitor.h"
int trace_events_enabled_count;
-/*
- * Interpretation depends on wether the event has the 'vcpu' property:
- * - false: Boolean value indicating whether the event is active.
- * - true : Integral counting the number of vCPUs that have this event enabled.
- */
-uint16_t trace_events_dstate[TRACE_EVENT_COUNT];
QemuOptsList qemu_trace_opts = {
.name = "trace",
@@ -294,11 +288,10 @@ void trace_init_vcpu_events(void)
if (trace_event_is_vcpu(ev) &&
trace_event_get_state_static(ev) &&
trace_event_get_state_dynamic(ev)) {
- TraceEventID id = trace_event_get_id(ev);
/* check preconditions */
- assert(trace_events_dstate[id] == 1);
+ assert(*ev->dstate == 1);
/* disable early-init state ... */
- trace_events_dstate[id] = 0;
+ *ev->dstate = 0;
trace_events_enabled_count--;
/* ... and properly re-enable */
trace_event_set_state_dynamic(ev, true);
diff --git a/trace/event-internal.h b/trace/event-internal.h
index 074faf6..3b9ceb5 100644
--- a/trace/event-internal.h
+++ b/trace/event-internal.h
@@ -19,6 +19,11 @@
* @vcpu_id: Unique per-vCPU event identifier.
* @name: Event name.
* @sstate: Static tracing state.
+ * @dstate: Dynamic tracing state
+ *
+ * Interpretation of @dstate depends on wether the event has the 'vcpu' property:
+ * - false: Boolean value indicating whether the event is active.
+ * - true : Integral counting the number of vCPUs that have this event enabled.
*
* Opaque generic description of a tracing event.
*/
@@ -27,6 +32,7 @@ typedef struct TraceEvent {
TraceEventVCPUID vcpu_id;
const char * name;
const bool sstate;
+ uint16_t *dstate;
} TraceEvent;
void trace_event_set_state_dynamic_init(TraceEvent *ev, bool state);
--
2.7.4
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [Qemu-devel] [PATCH v3 05/18] trace: remove duplicate control.h includes in generated-tracers.h
2016-09-19 14:48 [Qemu-devel] [PATCH v3 00/18] Refactor trace to allow modular build Daniel P. Berrange
` (3 preceding siblings ...)
2016-09-19 14:48 ` [Qemu-devel] [PATCH v3 04/18] trace: remove global 'uint16 dstate[]' array Daniel P. Berrange
@ 2016-09-19 14:48 ` Daniel P. Berrange
2016-09-19 17:06 ` Lluís Vilanova
2016-09-19 14:48 ` [Qemu-devel] [PATCH v3 06/18] trace: break circular dependancy in event-internal.h Daniel P. Berrange
` (14 subsequent siblings)
19 siblings, 1 reply; 48+ messages in thread
From: Daniel P. Berrange @ 2016-09-19 14:48 UTC (permalink / raw)
To: qemu-devel; +Cc: Stefan Hajnoczi, Lluís Vilanova, Daniel P. Berrange
The format/h.py file adds an include for control.h to
generated-tracers.h. ftrace, log and syslog, then
add more duplicate includes for control.h.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
scripts/tracetool/backend/ftrace.py | 1 -
scripts/tracetool/backend/log.py | 3 +--
scripts/tracetool/backend/syslog.py | 1 -
3 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/scripts/tracetool/backend/ftrace.py b/scripts/tracetool/backend/ftrace.py
index 80dcf30..4b83b44 100644
--- a/scripts/tracetool/backend/ftrace.py
+++ b/scripts/tracetool/backend/ftrace.py
@@ -21,7 +21,6 @@ PUBLIC = True
def generate_h_begin(events):
out('#include "trace/ftrace.h"',
- '#include "trace/control.h"',
'')
diff --git a/scripts/tracetool/backend/log.py b/scripts/tracetool/backend/log.py
index b3ff064..426bb6e 100644
--- a/scripts/tracetool/backend/log.py
+++ b/scripts/tracetool/backend/log.py
@@ -20,8 +20,7 @@ PUBLIC = True
def generate_h_begin(events):
- out('#include "trace/control.h"',
- '#include "qemu/log.h"',
+ out('#include "qemu/log.h"',
'')
diff --git a/scripts/tracetool/backend/syslog.py b/scripts/tracetool/backend/syslog.py
index 89019bc..5f693bd 100644
--- a/scripts/tracetool/backend/syslog.py
+++ b/scripts/tracetool/backend/syslog.py
@@ -21,7 +21,6 @@ PUBLIC = True
def generate_h_begin(events):
out('#include <syslog.h>',
- '#include "trace/control.h"',
'')
--
2.7.4
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [Qemu-devel] [PATCH v3 06/18] trace: break circular dependancy in event-internal.h
2016-09-19 14:48 [Qemu-devel] [PATCH v3 00/18] Refactor trace to allow modular build Daniel P. Berrange
` (4 preceding siblings ...)
2016-09-19 14:48 ` [Qemu-devel] [PATCH v3 05/18] trace: remove duplicate control.h includes in generated-tracers.h Daniel P. Berrange
@ 2016-09-19 14:48 ` Daniel P. Berrange
2016-09-19 17:08 ` Lluís Vilanova
2016-09-19 14:48 ` [Qemu-devel] [PATCH v3 07/18] trace: give each trace event a named TraceEvent struct Daniel P. Berrange
` (13 subsequent siblings)
19 siblings, 1 reply; 48+ messages in thread
From: Daniel P. Berrange @ 2016-09-19 14:48 UTC (permalink / raw)
To: qemu-devel; +Cc: Stefan Hajnoczi, Lluís Vilanova, Daniel P. Berrange
Currently event-internal.h includes generated-events.h,
while generated-events.h includes event-internal.h
causing a circular dependency.
event-internal.h requires that the content of
generated-events.h comes first, so that it can see
the typedefs for TraceEventID and TraceEventVCPUID.
Switching the TraceEvent struct to use uint32_t
for the two ID fields, removes the dependency on
the typedef, allowing events-internal.h to be a
self-contained header. This will then let the patch
following this move event-internal.h to the top of
generated-events.h, so we can expose TraceEvent
struct variables in generated-events.h
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
trace/event-internal.h | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/trace/event-internal.h b/trace/event-internal.h
index 3b9ceb5..36906e2 100644
--- a/trace/event-internal.h
+++ b/trace/event-internal.h
@@ -10,9 +10,6 @@
#ifndef TRACE__EVENT_INTERNAL_H
#define TRACE__EVENT_INTERNAL_H
-#include "trace/generated-events.h"
-
-
/**
* TraceEvent:
* @id: Unique event identifier.
@@ -28,8 +25,8 @@
* Opaque generic description of a tracing event.
*/
typedef struct TraceEvent {
- TraceEventID id;
- TraceEventVCPUID vcpu_id;
+ uint32_t id;
+ uint32_t vcpu_id;
const char * name;
const bool sstate;
uint16_t *dstate;
--
2.7.4
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [Qemu-devel] [PATCH v3 07/18] trace: give each trace event a named TraceEvent struct
2016-09-19 14:48 [Qemu-devel] [PATCH v3 00/18] Refactor trace to allow modular build Daniel P. Berrange
` (5 preceding siblings ...)
2016-09-19 14:48 ` [Qemu-devel] [PATCH v3 06/18] trace: break circular dependancy in event-internal.h Daniel P. Berrange
@ 2016-09-19 14:48 ` Daniel P. Berrange
2016-09-19 17:17 ` Lluís Vilanova
2016-09-19 14:48 ` [Qemu-devel] [PATCH v3 08/18] trace: remove the TraceEventID and TraceEventVCPUID enums Daniel P. Berrange
` (12 subsequent siblings)
19 siblings, 1 reply; 48+ messages in thread
From: Daniel P. Berrange @ 2016-09-19 14:48 UTC (permalink / raw)
To: qemu-devel; +Cc: Stefan Hajnoczi, Lluís Vilanova, Daniel P. Berrange
Currently we only expose a TraceEvent array, which must
be indexed via the TraceEventID enum constants. This
changes the generator to expose a named TraceEvent
instance for each event, with an _EV suffix.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
scripts/tracetool/format/events_c.py | 20 ++++++++++++++------
scripts/tracetool/format/events_h.py | 10 +++++++---
trace/control-internal.h | 2 +-
trace/control.c | 2 +-
4 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/scripts/tracetool/format/events_c.py b/scripts/tracetool/format/events_c.py
index ef873fa..5f67a7b 100644
--- a/scripts/tracetool/format/events_c.py
+++ b/scripts/tracetool/format/events_c.py
@@ -28,22 +28,30 @@ def generate(events, backend):
for e in events:
out('uint16_t %s;' % e.api(e.QEMU_DSTATE))
- out('TraceEvent trace_events[TRACE_EVENT_COUNT] = {')
-
for e in events:
if "vcpu" in e.properties:
vcpu_id = "TRACE_VCPU_" + e.name.upper()
else:
vcpu_id = "TRACE_VCPU_EVENT_COUNT"
- out(' { .id = %(id)s, .vcpu_id = %(vcpu_id)s,'
- ' .name = \"%(name)s\",'
- ' .sstate = %(sstate)s,',
- ' .dstate = &%(dstate)s, }, ',
+ out('TraceEvent %(event)s = {',
+ ' .id = %(id)s,',
+ ' .vcpu_id = %(vcpu_id)s,',
+ ' .name = \"%(name)s\",',
+ ' .sstate = %(sstate)s,',
+ ' .dstate = &%(dstate)s ',
+ '};',
+ event = "TRACE_" + e.name.upper() + "_EV",
id = "TRACE_" + e.name.upper(),
vcpu_id = vcpu_id,
name = e.name,
sstate = "TRACE_%s_ENABLED" % e.name.upper(),
dstate = e.api(e.QEMU_DSTATE))
+ out('TraceEvent *trace_events[TRACE_EVENT_COUNT] = {')
+
+ for e in events:
+ out('&%(event)s,',
+ event = "TRACE_" + e.name.upper() + "_EV")
+
out('};',
'')
diff --git a/scripts/tracetool/format/events_h.py b/scripts/tracetool/format/events_h.py
index 03417de..1478e4c 100644
--- a/scripts/tracetool/format/events_h.py
+++ b/scripts/tracetool/format/events_h.py
@@ -21,7 +21,12 @@ def generate(events, backend):
'',
'#ifndef TRACE__GENERATED_EVENTS_H',
'#define TRACE__GENERATED_EVENTS_H',
- '')
+ '',
+ '#include "trace/event-internal.h"',
+ )
+
+ for e in events:
+ out('extern TraceEvent TRACE_%s_EV;' % e.name.upper())
# event identifiers
out('typedef enum {')
@@ -58,6 +63,5 @@ def generate(events, backend):
enabled=enabled)
out('#define TRACE_%s_ENABLED %d' % (e.name.upper(), enabled))
- out('#include "trace/event-internal.h"',
- '',
+ out('',
'#endif /* TRACE__GENERATED_EVENTS_H */')
diff --git a/trace/control-internal.h b/trace/control-internal.h
index 828c1fc..52b6b72 100644
--- a/trace/control-internal.h
+++ b/trace/control-internal.h
@@ -15,7 +15,7 @@
#include "qom/cpu.h"
-extern TraceEvent trace_events[];
+extern TraceEvent *trace_events[];
extern int trace_events_enabled_count;
diff --git a/trace/control.c b/trace/control.c
index c681fa0..71ad6ba 100644
--- a/trace/control.c
+++ b/trace/control.c
@@ -106,7 +106,7 @@ void trace_event_iter_init(TraceEventIter *iter, const char *pattern)
TraceEvent *trace_event_iter_next(TraceEventIter *iter)
{
while (iter->event < TRACE_EVENT_COUNT) {
- TraceEvent *ev = &(trace_events[iter->event]);
+ TraceEvent *ev = trace_events[iter->event];
iter->event++;
if (!iter->pattern ||
pattern_glob(iter->pattern,
--
2.7.4
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [Qemu-devel] [PATCH v3 08/18] trace: remove the TraceEventID and TraceEventVCPUID enums
2016-09-19 14:48 [Qemu-devel] [PATCH v3 00/18] Refactor trace to allow modular build Daniel P. Berrange
` (6 preceding siblings ...)
2016-09-19 14:48 ` [Qemu-devel] [PATCH v3 07/18] trace: give each trace event a named TraceEvent struct Daniel P. Berrange
@ 2016-09-19 14:48 ` Daniel P. Berrange
2016-09-19 17:48 ` Lluís Vilanova
2016-09-19 14:49 ` [Qemu-devel] [PATCH v3 09/18] trace: emit name <-> ID mapping in simpletrace header Daniel P. Berrange
` (11 subsequent siblings)
19 siblings, 1 reply; 48+ messages in thread
From: Daniel P. Berrange @ 2016-09-19 14:48 UTC (permalink / raw)
To: qemu-devel; +Cc: Stefan Hajnoczi, Lluís Vilanova, Daniel P. Berrange
The TraceEventID and TraceEventVCPUID enums constants are
no longer actually used for anything critical.
The TRACE_EVENT_COUNT limit is used to determine the size
of the TraceEvents array, and can be removed if we just
NULL terminate the array instead.
The TRACE_EVENT_VCPU_COUNT limit is used as a magic value
for marking non-vCPU events, and also for declaring the
size of the trace dstate mask in the CPUState struct.
The former usage can be replaced by a dedicated constant
TRACE_EVENT_VCPU_NONE, defined as (uint32_t)-1. For the
latter usage, we can simply define a constant for the
number of VCPUs, avoiding the need for the full enum.
The only other usages of the enum values can be replaced
by accesing the id/vcpu_id fields via the named TraceEvent
structs.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
scripts/tracetool/backend/simple.py | 2 +-
scripts/tracetool/format/events_c.py | 16 +++++++++++-----
scripts/tracetool/format/events_h.py | 18 +++---------------
scripts/tracetool/format/h.py | 3 +--
trace/control-internal.h | 16 ++++++++--------
trace/control-target.c | 2 +-
trace/control.c | 2 +-
trace/control.h | 30 +++++++-----------------------
trace/event-internal.h | 6 ++++++
trace/simple.c | 6 +++---
trace/simple.h | 2 +-
11 files changed, 43 insertions(+), 60 deletions(-)
diff --git a/scripts/tracetool/backend/simple.py b/scripts/tracetool/backend/simple.py
index 1bccada..971bd97 100644
--- a/scripts/tracetool/backend/simple.py
+++ b/scripts/tracetool/backend/simple.py
@@ -80,7 +80,7 @@ def generate_c(event):
' return;',
' }',
'',
- ' if (trace_record_start(&rec, %(event_id)s, %(size_str)s)) {',
+ ' if (trace_record_start(&rec, %(event_id)s_EV.id, %(size_str)s)) {',
' return; /* Trace Buffer Full, Event Dropped ! */',
' }',
cond=cond,
diff --git a/scripts/tracetool/format/events_c.py b/scripts/tracetool/format/events_c.py
index 5f67a7b..07665df 100644
--- a/scripts/tracetool/format/events_c.py
+++ b/scripts/tracetool/format/events_c.py
@@ -28,11 +28,16 @@ def generate(events, backend):
for e in events:
out('uint16_t %s;' % e.api(e.QEMU_DSTATE))
+ next_id = 0
+ next_vcpu_id = 0
for e in events:
+ id = next_id
+ next_id += 1
if "vcpu" in e.properties:
- vcpu_id = "TRACE_VCPU_" + e.name.upper()
+ vcpu_id = next_vcpu_id
+ next_vcpu_id += 1
else:
- vcpu_id = "TRACE_VCPU_EVENT_COUNT"
+ vcpu_id = "TRACE_VCPU_EVENT_NONE"
out('TraceEvent %(event)s = {',
' .id = %(id)s,',
' .vcpu_id = %(vcpu_id)s,',
@@ -41,17 +46,18 @@ def generate(events, backend):
' .dstate = &%(dstate)s ',
'};',
event = "TRACE_" + e.name.upper() + "_EV",
- id = "TRACE_" + e.name.upper(),
+ id = id,
vcpu_id = vcpu_id,
name = e.name,
sstate = "TRACE_%s_ENABLED" % e.name.upper(),
dstate = e.api(e.QEMU_DSTATE))
- out('TraceEvent *trace_events[TRACE_EVENT_COUNT] = {')
+ out('TraceEvent *trace_events[] = {')
for e in events:
out('&%(event)s,',
event = "TRACE_" + e.name.upper() + "_EV")
- out('};',
+ out(' NULL,',
+ '};',
'')
diff --git a/scripts/tracetool/format/events_h.py b/scripts/tracetool/format/events_h.py
index 1478e4c..35cbc91 100644
--- a/scripts/tracetool/format/events_h.py
+++ b/scripts/tracetool/format/events_h.py
@@ -28,27 +28,15 @@ def generate(events, backend):
for e in events:
out('extern TraceEvent TRACE_%s_EV;' % e.name.upper())
- # event identifiers
- out('typedef enum {')
-
- for e in events:
- out(' TRACE_%s,' % e.name.upper())
-
- out(' TRACE_EVENT_COUNT',
- '} TraceEventID;')
-
for e in events:
out('extern uint16_t %s;' % e.api(e.QEMU_DSTATE))
- # per-vCPU event identifiers
- out('typedef enum {')
-
+ numvcpu = 0
for e in events:
if "vcpu" in e.properties:
- out(' TRACE_VCPU_%s,' % e.name.upper())
+ numvcpu += 1
- out(' TRACE_VCPU_EVENT_COUNT',
- '} TraceEventVCPUID;')
+ out("#define TRACE_VCPU_EVENT_COUNT %d" % numvcpu)
# static state
for e in events:
diff --git a/scripts/tracetool/format/h.py b/scripts/tracetool/format/h.py
index 3763e9a..64a6680 100644
--- a/scripts/tracetool/format/h.py
+++ b/scripts/tracetool/format/h.py
@@ -32,8 +32,7 @@ def generate(events, backend):
if "vcpu" in e.properties:
trace_cpu = next(iter(e.args))[1]
cond = "trace_event_get_vcpu_state(%(cpu)s,"\
- " TRACE_%(id)s,"\
- " TRACE_VCPU_%(id)s)"\
+ " TRACE_%(id)s)"\
% dict(
cpu=trace_cpu,
id=e.name.upper())
diff --git a/trace/control-internal.h b/trace/control-internal.h
index 52b6b72..c5bb53d 100644
--- a/trace/control-internal.h
+++ b/trace/control-internal.h
@@ -25,20 +25,20 @@ static inline bool trace_event_is_pattern(const char *str)
return strchr(str, '*') != NULL;
}
-static inline TraceEventID trace_event_get_id(TraceEvent *ev)
+static inline uint32_t trace_event_get_id(TraceEvent *ev)
{
assert(ev != NULL);
return ev->id;
}
-static inline TraceEventVCPUID trace_event_get_vcpu_id(TraceEvent *ev)
+static inline uint32_t trace_event_get_vcpu_id(TraceEvent *ev)
{
return ev->vcpu_id;
}
static inline bool trace_event_is_vcpu(TraceEvent *ev)
{
- return ev->vcpu_id != TRACE_VCPU_EVENT_COUNT;
+ return ev->vcpu_id != TRACE_VCPU_EVENT_NONE;
}
static inline const char * trace_event_get_name(TraceEvent *ev)
@@ -63,11 +63,11 @@ static inline bool trace_event_get_state_dynamic(TraceEvent *ev)
}
static inline bool trace_event_get_vcpu_state_dynamic_by_vcpu_id(CPUState *vcpu,
- TraceEventVCPUID id)
+ uint32_t vcpu_id)
{
/* it's on fast path, avoid consistency checks (asserts) */
if (unlikely(trace_events_enabled_count)) {
- return test_bit(id, vcpu->trace_dstate);
+ return test_bit(vcpu_id, vcpu->trace_dstate);
} else {
return false;
}
@@ -76,10 +76,10 @@ static inline bool trace_event_get_vcpu_state_dynamic_by_vcpu_id(CPUState *vcpu,
static inline bool trace_event_get_vcpu_state_dynamic(CPUState *vcpu,
TraceEvent *ev)
{
- TraceEventVCPUID id;
+ uint32_t vcpu_id;
assert(trace_event_is_vcpu(ev));
- id = trace_event_get_vcpu_id(ev);
- return trace_event_get_vcpu_state_dynamic_by_vcpu_id(vcpu, id);
+ vcpu_id = trace_event_get_vcpu_id(ev);
+ return trace_event_get_vcpu_state_dynamic_by_vcpu_id(vcpu, vcpu_id);
}
#endif /* TRACE__CONTROL_INTERNAL_H */
diff --git a/trace/control-target.c b/trace/control-target.c
index c69dda9..ff1bf43 100644
--- a/trace/control-target.c
+++ b/trace/control-target.c
@@ -59,7 +59,7 @@ void trace_event_set_state_dynamic(TraceEvent *ev, bool state)
void trace_event_set_vcpu_state_dynamic(CPUState *vcpu,
TraceEvent *ev, bool state)
{
- TraceEventVCPUID vcpu_id;
+ uint32_t vcpu_id;
bool state_pre;
assert(trace_event_get_state_static(ev));
assert(trace_event_is_vcpu(ev));
diff --git a/trace/control.c b/trace/control.c
index 71ad6ba..60235c5 100644
--- a/trace/control.c
+++ b/trace/control.c
@@ -105,7 +105,7 @@ void trace_event_iter_init(TraceEventIter *iter, const char *pattern)
TraceEvent *trace_event_iter_next(TraceEventIter *iter)
{
- while (iter->event < TRACE_EVENT_COUNT) {
+ while (trace_events[iter->event] != NULL) {
TraceEvent *ev = trace_events[iter->event];
iter->event++;
if (!iter->pattern ||
diff --git a/trace/control.h b/trace/control.h
index e80c220..c7c0a88 100644
--- a/trace/control.h
+++ b/trace/control.h
@@ -18,17 +18,6 @@ typedef struct TraceEventIter {
const char *pattern;
} TraceEventIter;
-/**
- * TraceEventID:
- *
- * Unique tracing event identifier.
- *
- * These are named as 'TRACE_${EVENT_NAME}'.
- *
- * See also: "trace/generated-events.h"
- */
-enum TraceEventID;
-
/**
* trace_event_iter_init:
@@ -76,17 +65,17 @@ static bool trace_event_is_pattern(const char *str);
*
* Get the identifier of an event.
*/
-static TraceEventID trace_event_get_id(TraceEvent *ev);
+static uint32_t trace_event_get_id(TraceEvent *ev);
/**
* trace_event_get_vcpu_id:
*
* Get the per-vCPU identifier of an event.
*
- * Special value #TRACE_VCPU_EVENT_COUNT means the event is not vCPU-specific
+ * Special value #TRACE_VCPU_EVENT_NONE means the event is not vCPU-specific
* (does not have the "vcpu" property).
*/
-static TraceEventVCPUID trace_event_get_vcpu_id(TraceEvent *ev);
+static uint32_t trace_event_get_vcpu_id(TraceEvent *ev);
/**
* trace_event_is_vcpu:
@@ -104,14 +93,12 @@ static const char * trace_event_get_name(TraceEvent *ev);
/**
* trace_event_get_state:
- * @id: Event identifier.
+ * @id: Event identifier name.
*
* Get the tracing state of an event (both static and dynamic).
*
* If the event has the disabled property, the check will have no performance
* impact.
- *
- * As a down side, you must always use an immediate #TraceEventID value.
*/
#define trace_event_get_state(id) \
((id ##_ENABLED) && trace_event_get_state_dynamic_by_id(id))
@@ -119,19 +106,16 @@ static const char * trace_event_get_name(TraceEvent *ev);
/**
* trace_event_get_vcpu_state:
* @vcpu: Target vCPU.
- * @id: Event identifier (TraceEventID).
- * @vcpu_id: Per-vCPU event identifier (TraceEventVCPUID).
+ * @id: Event identifier name.
*
* Get the tracing state of an event (both static and dynamic) for the given
* vCPU.
*
* If the event has the disabled property, the check will have no performance
* impact.
- *
- * As a down side, you must always use an immediate #TraceEventID value.
*/
-#define trace_event_get_vcpu_state(vcpu, id, vcpu_id) \
- ((id ##_ENABLED) && trace_event_get_vcpu_state_dynamic_by_vcpu_id(vcpu, vcpu_id))
+#define trace_event_get_vcpu_state(vcpu, id) \
+ ((id ##_ENABLED) && trace_event_get_vcpu_state_dynamic_by_vcpu_id(vcpu, id ## _EV.vcpu_id))
/**
* trace_event_get_state_static:
diff --git a/trace/event-internal.h b/trace/event-internal.h
index 36906e2..0276804 100644
--- a/trace/event-internal.h
+++ b/trace/event-internal.h
@@ -10,6 +10,12 @@
#ifndef TRACE__EVENT_INTERNAL_H
#define TRACE__EVENT_INTERNAL_H
+/*
+ * Special value for TraceEvent.vcpu_id field to indicate
+ * that the event is not VCPU specific
+ */
+#define TRACE_VCPU_EVENT_NONE (uint32_t)-1
+
/**
* TraceEvent:
* @id: Unique event identifier.
diff --git a/trace/simple.c b/trace/simple.c
index 2f09daf..716b66d 100644
--- a/trace/simple.c
+++ b/trace/simple.c
@@ -18,7 +18,7 @@
#include "trace/simple.h"
/** Trace file header event ID */
-#define HEADER_EVENT_ID (~(uint64_t)0) /* avoids conflicting with TraceEventIDs */
+#define HEADER_EVENT_ID (~(uint64_t)0) /* avoids conflicting with trace event IDs */
/** Trace file magic number */
#define HEADER_MAGIC 0xf2b177cb0aa429b4ULL
@@ -58,7 +58,7 @@ static char *trace_file_name;
/* * Trace buffer entry */
typedef struct {
- uint64_t event; /* TraceEventID */
+ uint64_t event; /* event ID value */
uint64_t timestamp_ns;
uint32_t length; /* in bytes */
uint32_t pid;
@@ -202,7 +202,7 @@ void trace_record_write_str(TraceBufferRecord *rec, const char *s, uint32_t slen
rec->rec_off = write_to_buffer(rec->rec_off, (void*)s, slen);
}
-int trace_record_start(TraceBufferRecord *rec, TraceEventID event, size_t datasize)
+int trace_record_start(TraceBufferRecord *rec, uint32_t event, size_t datasize)
{
unsigned int idx, rec_off, old_idx, new_idx;
uint32_t rec_len = sizeof(TraceRecord) + datasize;
diff --git a/trace/simple.h b/trace/simple.h
index 1e7de45..17ce472 100644
--- a/trace/simple.h
+++ b/trace/simple.h
@@ -33,7 +33,7 @@ typedef struct {
*
* @arglen number of bytes required for arguments
*/
-int trace_record_start(TraceBufferRecord *rec, TraceEventID id, size_t arglen);
+int trace_record_start(TraceBufferRecord *rec, uint32_t id, size_t arglen);
/**
* Append a 64-bit argument to a trace record
--
2.7.4
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [Qemu-devel] [PATCH v3 09/18] trace: emit name <-> ID mapping in simpletrace header
2016-09-19 14:48 [Qemu-devel] [PATCH v3 00/18] Refactor trace to allow modular build Daniel P. Berrange
` (7 preceding siblings ...)
2016-09-19 14:48 ` [Qemu-devel] [PATCH v3 08/18] trace: remove the TraceEventID and TraceEventVCPUID enums Daniel P. Berrange
@ 2016-09-19 14:49 ` Daniel P. Berrange
2016-09-19 14:49 ` [Qemu-devel] [PATCH v3 10/18] trace: don't abort qemu if ftrace can't be initialized Daniel P. Berrange
` (10 subsequent siblings)
19 siblings, 0 replies; 48+ messages in thread
From: Daniel P. Berrange @ 2016-09-19 14:49 UTC (permalink / raw)
To: qemu-devel; +Cc: Stefan Hajnoczi, Lluís Vilanova, Daniel P. Berrange
Currently simpletrace assumes that events are given IDs
starting from 0, based on the order in which they appear
in the trace-events file, with no gaps. When the
trace-events file is split up, this assumption becomes
problematic.
To deal with this, extend the simpletrace format so that
it outputs a table of event name <-> ID mappings. That
will allow QEMU to assign arbitrary IDs to events without
breaking simpletrace parsing.
The v3 simple trace format was
FILE HEADER
EVENT TRACE RECORD 0
EVENT TRACE RECORD 1
...
EVENT TRACE RECORD N
The v4 simple trace format is now
FILE HEADER
EVENT MAPPING RECORD 0
EVENT MAPPING RECORD 1
...
EVENT MAPPING RECORD M
EVENT TRACE RECORD RECORD 0
EVENT TRACE RECORD RECORD 1
...
EVENT TRACE RECORD N
Although this shows all the mapping records being emitted
upfront, this is not required by the format. While the main
simpletrace backend will emit all mappings at startup,
the systemtap simpletrace.stp script will emit the mappings
at first use. eg
FILE HEADER
...
EVENT MAPPING RECORD 0
EVENT TRACE RECORD RECORD 0
EVENT TRACE RECORD RECORD 1
EVENT MAPPING RECORD 1
EVENT TRACE RECORD RECORD 2
...
EVENT TRACE RECORD N
This is more space efficient given that most trace records
only include a subset of events.
In modifying the systemtap simpletrace code, a 'begin' probe
was added to emit the trace event header, so you no longer
need to add '--no-header' when running simpletrace.py for
systemtap generated trace files.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
scripts/simpletrace.py | 49 ++++++++++++++++++++--------
scripts/tracetool/format/simpletrace_stap.py | 23 +++++++++++--
trace/simple.c | 32 ++++++++++++++++--
3 files changed, 86 insertions(+), 18 deletions(-)
diff --git a/scripts/simpletrace.py b/scripts/simpletrace.py
index 3916c6d..98abb7a 100755
--- a/scripts/simpletrace.py
+++ b/scripts/simpletrace.py
@@ -19,6 +19,9 @@ header_event_id = 0xffffffffffffffff
header_magic = 0xf2b177cb0aa429b4
dropped_event_id = 0xfffffffffffffffe
+record_type_mapping = 0
+record_type_event = 1
+
log_header_fmt = '=QQQ'
rec_header_fmt = '=QQII'
@@ -30,14 +33,15 @@ def read_header(fobj, hfmt):
return None
return struct.unpack(hfmt, hdr)
-def get_record(edict, rechdr, fobj):
- """Deserialize a trace record from a file into a tuple (event_num, timestamp, pid, arg1, ..., arg6)."""
+def get_record(edict, idtoname, rechdr, fobj):
+ """Deserialize a trace record from a file into a tuple (name, timestamp, pid, arg1, ..., arg6)."""
if rechdr is None:
return None
- rec = (rechdr[0], rechdr[1], rechdr[3])
if rechdr[0] != dropped_event_id:
event_id = rechdr[0]
- event = edict[event_id]
+ name = idtoname[event_id]
+ rec = (name, rechdr[1], rechdr[3])
+ event = edict[name]
for type, name in event.args:
if is_string(type):
l = fobj.read(4)
@@ -48,15 +52,22 @@ def get_record(edict, rechdr, fobj):
(value,) = struct.unpack('=Q', fobj.read(8))
rec = rec + (value,)
else:
+ rec = ("dropped", rechdr[1], rechdr[3])
(value,) = struct.unpack('=Q', fobj.read(8))
rec = rec + (value,)
return rec
+def get_mapping(fobj):
+ (event_id, ) = struct.unpack('=Q', fobj.read(8))
+ (len, ) = struct.unpack('=L', fobj.read(4))
+ name = fobj.read(len)
+
+ return (event_id, name)
-def read_record(edict, fobj):
+def read_record(edict, idtoname, fobj):
"""Deserialize a trace record from a file into a tuple (event_num, timestamp, pid, arg1, ..., arg6)."""
rechdr = read_header(fobj, rec_header_fmt)
- return get_record(edict, rechdr, fobj) # return tuple of record elements
+ return get_record(edict, idtoname, rechdr, fobj) # return tuple of record elements
def read_trace_header(fobj):
"""Read and verify trace file header"""
@@ -67,20 +78,30 @@ def read_trace_header(fobj):
raise ValueError('Not a valid trace file!')
log_version = header[2]
- if log_version not in [0, 2, 3]:
+ if log_version not in [0, 2, 3, 4]:
raise ValueError('Unknown version of tracelog format!')
- if log_version != 3:
+ if log_version != 4:
raise ValueError('Log format %d not supported with this QEMU release!'
% log_version)
def read_trace_records(edict, fobj):
"""Deserialize trace records from a file, yielding record tuples (event_num, timestamp, pid, arg1, ..., arg6)."""
+ idtoname = {
+ dropped_event_id: "dropped"
+ }
while True:
- rec = read_record(edict, fobj)
- if rec is None:
+ t = fobj.read(8)
+ if len(t) == 0:
break
- yield rec
+ (rectype, ) = struct.unpack('=Q', t)
+ if rectype == record_type_mapping:
+ mapping = get_mapping(fobj)
+ idtoname[mapping[0]] = mapping[1]
+ else:
+ rec = read_record(edict, idtoname, fobj)
+
+ yield rec
class Analyzer(object):
"""A trace file analyzer which processes trace records.
@@ -115,10 +136,10 @@ def process(events, log, analyzer, read_header=True):
read_trace_header(log)
dropped_event = Event.build("Dropped_Event(uint64_t num_events_dropped)")
- edict = {dropped_event_id: dropped_event}
+ edict = {"dropped": dropped_event}
- for num, event in enumerate(events):
- edict[num] = event
+ for event in events:
+ edict[event.name] = event
def build_fn(analyzer, event):
if isinstance(event, str):
diff --git a/scripts/tracetool/format/simpletrace_stap.py b/scripts/tracetool/format/simpletrace_stap.py
index 7e44bc1..0573f43 100644
--- a/scripts/tracetool/format/simpletrace_stap.py
+++ b/scripts/tracetool/format/simpletrace_stap.py
@@ -21,6 +21,24 @@ from tracetool.format.stap import stap_escape
def generate(events, backend):
out('/* This file is autogenerated by tracetool, do not edit. */',
+ '',
+ 'global event_name_to_id_map',
+ 'global event_next_id',
+ 'function simple_trace_map_event(name)',
+ '',
+ '{',
+ ' if (!([name] in event_name_to_id_map)) {',
+ ' event_name_to_id_map[name] = event_next_id',
+ ' name_len = strlen(name)',
+ ' printf("%%8b%%8b%%4b%%.*s", 0, event_next_id, name_len, name_len, name)',
+ ' event_next_id = event_next_id + 1',
+ ' }',
+ ' return event_name_to_id_map[name]',
+ '}',
+ 'probe begin',
+ '{',
+ ' printf("%%8b%%8b%%8b", 0xffffffffffffffff, 0xf2b177cb0aa429b4, 4)',
+ '}',
'')
for event_id, e in enumerate(events):
@@ -29,6 +47,7 @@ def generate(events, backend):
out('probe %(probeprefix)s.simpletrace.%(name)s = %(probeprefix)s.%(name)s ?',
'{',
+ ' id = simple_trace_map_event("%(name)s")',
probeprefix=probeprefix(),
name=e.name)
@@ -48,7 +67,7 @@ def generate(events, backend):
sizestr = ' + '.join(sizes)
# Generate format string and value pairs for record header and arguments
- fields = [('8b', str(event_id)),
+ fields = [('8b', 'id'),
('8b', 'gettimeofday_ns()'),
('4b', sizestr),
('4b', 'pid()')]
@@ -63,7 +82,7 @@ def generate(events, backend):
# Emit the entire record in a single SystemTap printf()
fmt_str = '%'.join(fmt for fmt, _ in fields)
arg_str = ', '.join(arg for _, arg in fields)
- out(' printf("%%%(fmt_str)s", %(arg_str)s)',
+ out(' printf("%%8b%%%(fmt_str)s", 1, %(arg_str)s)',
fmt_str=fmt_str, arg_str=arg_str)
out('}')
diff --git a/trace/simple.c b/trace/simple.c
index 716b66d..81caa5a 100644
--- a/trace/simple.c
+++ b/trace/simple.c
@@ -24,7 +24,7 @@
#define HEADER_MAGIC 0xf2b177cb0aa429b4ULL
/** Trace file version number, bump if format changes */
-#define HEADER_VERSION 3
+#define HEADER_VERSION 4
/** Records were dropped event ID */
#define DROPPED_EVENT_ID (~(uint64_t)0 - 1)
@@ -56,6 +56,9 @@ static uint32_t trace_pid;
static FILE *trace_fp;
static char *trace_file_name;
+#define TRACE_RECORD_TYPE_MAPPING 0
+#define TRACE_RECORD_TYPE_EVENT 1
+
/* * Trace buffer entry */
typedef struct {
uint64_t event; /* event ID value */
@@ -160,6 +163,7 @@ static gpointer writeout_thread(gpointer opaque)
unsigned int idx = 0;
int dropped_count;
size_t unused __attribute__ ((unused));
+ uint64_t type = TRACE_RECORD_TYPE_EVENT;
for (;;) {
wait_for_trace_records_available();
@@ -174,10 +178,12 @@ static gpointer writeout_thread(gpointer opaque)
} while (!g_atomic_int_compare_and_exchange(&dropped_events,
dropped_count, 0));
dropped.rec.arguments[0] = dropped_count;
+ unused = fwrite(&type, sizeof(type), 1, trace_fp);
unused = fwrite(&dropped.rec, dropped.rec.length, 1, trace_fp);
}
while (get_trace_record(idx, &recordptr)) {
+ unused = fwrite(&type, sizeof(type), 1, trace_fp);
unused = fwrite(recordptr, recordptr->length, 1, trace_fp);
writeout_idx += recordptr->length;
free(recordptr); /* don't use g_free, can deadlock when traced */
@@ -273,6 +279,27 @@ void trace_record_finish(TraceBufferRecord *rec)
}
}
+static int st_write_event_mapping(void)
+{
+ uint64_t type = TRACE_RECORD_TYPE_MAPPING;
+ TraceEventIter iter;
+ TraceEvent *ev;
+
+ trace_event_iter_init(&iter, NULL);
+ while ((ev = trace_event_iter_next(&iter)) != NULL) {
+ uint64_t id = trace_event_get_id(ev);
+ const char *name = trace_event_get_name(ev);
+ uint32_t len = strlen(name);
+ if (fwrite(&type, sizeof(type), 1, trace_fp) != 1 ||
+ fwrite(&id, sizeof(id), 1, trace_fp) != 1 ||
+ fwrite(&len, sizeof(len), 1, trace_fp) != 1 ||
+ fwrite(name, len, 1, trace_fp) != 1)
+ return -1;
+ }
+
+ return 0;
+}
+
void st_set_trace_file_enabled(bool enable)
{
if (enable == !!trace_fp) {
@@ -297,7 +324,8 @@ void st_set_trace_file_enabled(bool enable)
return;
}
- if (fwrite(&header, sizeof header, 1, trace_fp) != 1) {
+ if (fwrite(&header, sizeof header, 1, trace_fp) != 1 ||
+ st_write_event_mapping() < 0) {
fclose(trace_fp);
trace_fp = NULL;
return;
--
2.7.4
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [Qemu-devel] [PATCH v3 10/18] trace: don't abort qemu if ftrace can't be initialized
2016-09-19 14:48 [Qemu-devel] [PATCH v3 00/18] Refactor trace to allow modular build Daniel P. Berrange
` (8 preceding siblings ...)
2016-09-19 14:49 ` [Qemu-devel] [PATCH v3 09/18] trace: emit name <-> ID mapping in simpletrace header Daniel P. Berrange
@ 2016-09-19 14:49 ` Daniel P. Berrange
2016-09-19 14:49 ` [Qemu-devel] [PATCH v3 11/18] trace: provide mechanism for registering trace events Daniel P. Berrange
` (9 subsequent siblings)
19 siblings, 0 replies; 48+ messages in thread
From: Daniel P. Berrange @ 2016-09-19 14:49 UTC (permalink / raw)
To: qemu-devel; +Cc: Stefan Hajnoczi, Lluís Vilanova, Daniel P. Berrange
If the ftrace backend is compiled into QEMU, any attempt
to start QEMU while non-root will fail due to the
inability to open /sys/kernel/debug/tracing/trace_on.
Add a fallback into the code so that it connects up the
trace_marker_fd variable to /dev/null when setting
EACCESS on the 'trace_on' file. This allows QEMU to
run, with ftrace turned into a no-op.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
trace/ftrace.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/trace/ftrace.c b/trace/ftrace.c
index e953922..3588bb0 100644
--- a/trace/ftrace.c
+++ b/trace/ftrace.c
@@ -51,6 +51,12 @@ bool ftrace_init(void)
snprintf(path, PATH_MAX, "%s/tracing/tracing_on", debugfs);
trace_fd = open(path, O_WRONLY);
if (trace_fd < 0) {
+ if (errno == EACCES) {
+ trace_marker_fd = open("/dev/null", O_WRONLY);
+ if (trace_marker_fd != -1) {
+ return true;
+ }
+ }
perror("Could not open ftrace 'tracing_on' file");
return false;
} else {
--
2.7.4
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [Qemu-devel] [PATCH v3 11/18] trace: provide mechanism for registering trace events
2016-09-19 14:48 [Qemu-devel] [PATCH v3 00/18] Refactor trace to allow modular build Daniel P. Berrange
` (9 preceding siblings ...)
2016-09-19 14:49 ` [Qemu-devel] [PATCH v3 10/18] trace: don't abort qemu if ftrace can't be initialized Daniel P. Berrange
@ 2016-09-19 14:49 ` Daniel P. Berrange
2016-09-19 14:49 ` [Qemu-devel] [PATCH v3 12/18] trace: dynamically allocate trace_dstate in CPUState Daniel P. Berrange
` (8 subsequent siblings)
19 siblings, 0 replies; 48+ messages in thread
From: Daniel P. Berrange @ 2016-09-19 14:49 UTC (permalink / raw)
To: qemu-devel; +Cc: Stefan Hajnoczi, Lluís Vilanova, Daniel P. Berrange
Remove the notion of there being a single global array
of trace events, by introducing a method for registering
groups of events.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
include/qemu/module.h | 2 ++
qemu-img.c | 1 +
qemu-io.c | 1 +
qemu-nbd.c | 1 +
scripts/tracetool/format/events_c.py | 6 ++++++
trace/control-internal.h | 4 +++-
trace/control.c | 25 +++++++++++++++++++++++--
trace/control.h | 1 +
vl.c | 2 ++
9 files changed, 40 insertions(+), 3 deletions(-)
diff --git a/include/qemu/module.h b/include/qemu/module.h
index 2370708..c700961 100644
--- a/include/qemu/module.h
+++ b/include/qemu/module.h
@@ -44,6 +44,7 @@ typedef enum {
MODULE_INIT_OPTS,
MODULE_INIT_QAPI,
MODULE_INIT_QOM,
+ MODULE_INIT_TRACE,
MODULE_INIT_MAX
} module_init_type;
@@ -51,6 +52,7 @@ typedef enum {
#define opts_init(function) module_init(function, MODULE_INIT_OPTS)
#define qapi_init(function) module_init(function, MODULE_INIT_QAPI)
#define type_init(function) module_init(function, MODULE_INIT_QOM)
+#define trace_init(function) module_init(function, MODULE_INIT_TRACE)
void register_module_init(void (*fn)(void), module_init_type type);
void register_dso_module_init(void (*fn)(void), module_init_type type);
diff --git a/qemu-img.c b/qemu-img.c
index ea52486..bbe648a 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -3824,6 +3824,7 @@ int main(int argc, char **argv)
signal(SIGPIPE, SIG_IGN);
#endif
+ module_call_init(MODULE_INIT_TRACE);
error_set_progname(argv[0]);
qemu_init_exec_dir(argv[0]);
diff --git a/qemu-io.c b/qemu-io.c
index db129ea..23a229f 100644
--- a/qemu-io.c
+++ b/qemu-io.c
@@ -467,6 +467,7 @@ int main(int argc, char **argv)
signal(SIGPIPE, SIG_IGN);
#endif
+ module_call_init(MODULE_INIT_TRACE);
progname = basename(argv[0]);
qemu_init_exec_dir(argv[0]);
diff --git a/qemu-nbd.c b/qemu-nbd.c
index 99297a5..361880b 100644
--- a/qemu-nbd.c
+++ b/qemu-nbd.c
@@ -533,6 +533,7 @@ int main(int argc, char **argv)
sa_sigterm.sa_handler = termsig_handler;
sigaction(SIGTERM, &sa_sigterm, NULL);
+ module_call_init(MODULE_INIT_TRACE);
qcrypto_init(&error_fatal);
module_call_init(MODULE_INIT_QOM);
diff --git a/scripts/tracetool/format/events_c.py b/scripts/tracetool/format/events_c.py
index 07665df..7f00b50 100644
--- a/scripts/tracetool/format/events_c.py
+++ b/scripts/tracetool/format/events_c.py
@@ -61,3 +61,9 @@ def generate(events, backend):
out(' NULL,',
'};',
'')
+
+ out('static void trace_register_events(void)',
+ '{',
+ ' trace_event_register_group(trace_events);',
+ '}',
+ 'trace_init(trace_register_events)')
diff --git a/trace/control-internal.h b/trace/control-internal.h
index c5bb53d..7de9ddd 100644
--- a/trace/control-internal.h
+++ b/trace/control-internal.h
@@ -15,7 +15,6 @@
#include "qom/cpu.h"
-extern TraceEvent *trace_events[];
extern int trace_events_enabled_count;
@@ -82,4 +81,7 @@ static inline bool trace_event_get_vcpu_state_dynamic(CPUState *vcpu,
return trace_event_get_vcpu_state_dynamic_by_vcpu_id(vcpu, vcpu_id);
}
+
+void trace_event_register_group(TraceEvent **events);
+
#endif /* TRACE__CONTROL_INTERNAL_H */
diff --git a/trace/control.c b/trace/control.c
index 60235c5..2db7196 100644
--- a/trace/control.c
+++ b/trace/control.c
@@ -29,6 +29,13 @@
int trace_events_enabled_count;
+typedef struct TraceEventGroup {
+ TraceEvent **events;
+} TraceEventGroup;
+
+static TraceEventGroup *event_groups;
+static size_t nevent_groups;
+
QemuOptsList qemu_trace_opts = {
.name = "trace",
.implied_opt_name = "enable",
@@ -50,6 +57,14 @@ QemuOptsList qemu_trace_opts = {
};
+void trace_event_register_group(TraceEvent **events)
+{
+ event_groups = g_renew(TraceEventGroup, event_groups, nevent_groups + 1);
+ event_groups[nevent_groups].events = events;
+ nevent_groups++;
+}
+
+
TraceEvent *trace_event_name(const char *name)
{
assert(name != NULL);
@@ -100,14 +115,20 @@ static bool pattern_glob(const char *pat, const char *ev)
void trace_event_iter_init(TraceEventIter *iter, const char *pattern)
{
iter->event = 0;
+ iter->group = 0;
iter->pattern = pattern;
}
TraceEvent *trace_event_iter_next(TraceEventIter *iter)
{
- while (trace_events[iter->event] != NULL) {
- TraceEvent *ev = trace_events[iter->event];
+ while (iter->group < nevent_groups &&
+ event_groups[iter->group].events[iter->event] != NULL) {
+ TraceEvent *ev = event_groups[iter->group].events[iter->event];
iter->event++;
+ if (event_groups[iter->group].events[iter->event] == NULL) {
+ iter->event = 0;
+ iter->group++;
+ }
if (!iter->pattern ||
pattern_glob(iter->pattern,
trace_event_get_name(ev))) {
diff --git a/trace/control.h b/trace/control.h
index c7c0a88..265e387 100644
--- a/trace/control.h
+++ b/trace/control.h
@@ -15,6 +15,7 @@
typedef struct TraceEventIter {
size_t event;
+ size_t group;
const char *pattern;
} TraceEventIter;
diff --git a/vl.c b/vl.c
index ad2664b..88f5b36 100644
--- a/vl.c
+++ b/vl.c
@@ -2979,6 +2979,8 @@ int main(int argc, char **argv, char **envp)
Error *err = NULL;
bool list_data_dirs = false;
+ module_call_init(MODULE_INIT_TRACE);
+
qemu_init_cpu_loop();
qemu_mutex_lock_iothread();
--
2.7.4
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [Qemu-devel] [PATCH v3 12/18] trace: dynamically allocate trace_dstate in CPUState
2016-09-19 14:48 [Qemu-devel] [PATCH v3 00/18] Refactor trace to allow modular build Daniel P. Berrange
` (10 preceding siblings ...)
2016-09-19 14:49 ` [Qemu-devel] [PATCH v3 11/18] trace: provide mechanism for registering trace events Daniel P. Berrange
@ 2016-09-19 14:49 ` Daniel P. Berrange
2016-09-19 17:58 ` Lluís Vilanova
2016-09-19 14:49 ` [Qemu-devel] [PATCH v3 13/18] trace: dynamically allocate event IDs at runtime Daniel P. Berrange
` (7 subsequent siblings)
19 siblings, 1 reply; 48+ messages in thread
From: Daniel P. Berrange @ 2016-09-19 14:49 UTC (permalink / raw)
To: qemu-devel; +Cc: Stefan Hajnoczi, Lluís Vilanova, Daniel P. Berrange
The CPUState struct has a bitmap tracking which VCPU
events are currently active. This is indexed based on
the event ID values, and sized according the maximum
TraceEventVCPUID enum value.
When we start dynamically assigning IDs at runtime,
we can't statically declare a bitmap without making
an assumption about the max event count. This problem
can be solved by dynamically allocating the per-CPU
dstate bitmap.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
include/qom/cpu.h | 7 ++++---
qom/cpu.c | 7 ++++++-
trace/control.c | 5 +++++
trace/control.h | 7 +++++++
4 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/include/qom/cpu.h b/include/qom/cpu.h
index ce0c406..fa746b1 100644
--- a/include/qom/cpu.h
+++ b/include/qom/cpu.h
@@ -27,7 +27,6 @@
#include "qemu/bitmap.h"
#include "qemu/queue.h"
#include "qemu/thread.h"
-#include "trace/generated-events.h"
typedef int (*WriteCoreDumpFunction)(const void *buf, size_t size,
void *opaque);
@@ -350,8 +349,10 @@ struct CPUState {
struct KVMState *kvm_state;
struct kvm_run *kvm_run;
- /* Used for events with 'vcpu' and *without* the 'disabled' properties */
- DECLARE_BITMAP(trace_dstate, TRACE_VCPU_EVENT_COUNT);
+ /* Used for events with 'vcpu' and *without* the 'disabled' properties
+ * Dynamically allocated based on BITS_TO_LONGS(trace_get_vcpu_event_count())
+ */
+ unsigned long *trace_dstate;
/* TODO Move common fields from CPUArchState here. */
int cpu_index; /* used by alpha TCG */
diff --git a/qom/cpu.c b/qom/cpu.c
index 2553247..3a125b9 100644
--- a/qom/cpu.c
+++ b/qom/cpu.c
@@ -29,6 +29,7 @@
#include "qemu/error-report.h"
#include "sysemu/sysemu.h"
#include "hw/qdev-properties.h"
+#include "trace/control.h"
bool cpu_exists(int64_t id)
{
@@ -345,12 +346,16 @@ static void cpu_common_initfn(Object *obj)
qemu_mutex_init(&cpu->work_mutex);
QTAILQ_INIT(&cpu->breakpoints);
QTAILQ_INIT(&cpu->watchpoints);
- bitmap_zero(cpu->trace_dstate, TRACE_VCPU_EVENT_COUNT);
+
+ cpu->trace_dstate = g_new0(unsigned long,
+ BITS_TO_LONGS(trace_get_vcpu_event_count()));
}
static void cpu_common_finalize(Object *obj)
{
+ CPUState *cpu = CPU(obj);
cpu_exec_exit(CPU(obj));
+ g_free(cpu->trace_dstate);
}
static int64_t cpu_common_get_arch_id(CPUState *cpu)
diff --git a/trace/control.c b/trace/control.c
index 2db7196..0633774 100644
--- a/trace/control.c
+++ b/trace/control.c
@@ -319,3 +319,8 @@ void trace_init_vcpu_events(void)
}
}
}
+
+uint32_t trace_get_vcpu_event_count(void)
+{
+ return TRACE_VCPU_EVENT_COUNT;
+}
diff --git a/trace/control.h b/trace/control.h
index 265e387..60905f7 100644
--- a/trace/control.h
+++ b/trace/control.h
@@ -234,6 +234,13 @@ char *trace_opt_parse(const char *optarg);
void trace_init_vcpu_events(void);
+/**
+ * trace_get_vcpu_event_count:
+ *
+ * Return the number of known vcpu-specific events
+ */
+uint32_t trace_get_vcpu_event_count(void);
+
#include "trace/control-internal.h"
#endif /* TRACE__CONTROL_H */
--
2.7.4
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [Qemu-devel] [PATCH v3 13/18] trace: dynamically allocate event IDs at runtime
2016-09-19 14:48 [Qemu-devel] [PATCH v3 00/18] Refactor trace to allow modular build Daniel P. Berrange
` (11 preceding siblings ...)
2016-09-19 14:49 ` [Qemu-devel] [PATCH v3 12/18] trace: dynamically allocate trace_dstate in CPUState Daniel P. Berrange
@ 2016-09-19 14:49 ` Daniel P. Berrange
2016-09-19 18:05 ` Lluís Vilanova
2016-09-19 14:49 ` [Qemu-devel] [PATCH v3 14/18] trace: get rid of generated-events.h/generated-events.c Daniel P. Berrange
` (6 subsequent siblings)
19 siblings, 1 reply; 48+ messages in thread
From: Daniel P. Berrange @ 2016-09-19 14:49 UTC (permalink / raw)
To: qemu-devel; +Cc: Stefan Hajnoczi, Lluís Vilanova, Daniel P. Berrange
Instead of having the code generator assign event IDs and
event VCPU IDs, assign them when the events are registered
at runtime. This will allow us allow code to be generated
from individual trace-events without having to figure out
globally unique numbering at build time.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
scripts/tracetool/format/events_c.py | 10 ++--------
scripts/tracetool/format/events_h.py | 7 -------
trace/control.c | 11 ++++++++++-
3 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/scripts/tracetool/format/events_c.py b/scripts/tracetool/format/events_c.py
index 7f00b50..1b5790d 100644
--- a/scripts/tracetool/format/events_c.py
+++ b/scripts/tracetool/format/events_c.py
@@ -28,25 +28,19 @@ def generate(events, backend):
for e in events:
out('uint16_t %s;' % e.api(e.QEMU_DSTATE))
- next_id = 0
- next_vcpu_id = 0
for e in events:
- id = next_id
- next_id += 1
if "vcpu" in e.properties:
- vcpu_id = next_vcpu_id
- next_vcpu_id += 1
+ vcpu_id = 0
else:
vcpu_id = "TRACE_VCPU_EVENT_NONE"
out('TraceEvent %(event)s = {',
- ' .id = %(id)s,',
+ ' .id = 0,',
' .vcpu_id = %(vcpu_id)s,',
' .name = \"%(name)s\",',
' .sstate = %(sstate)s,',
' .dstate = &%(dstate)s ',
'};',
event = "TRACE_" + e.name.upper() + "_EV",
- id = id,
vcpu_id = vcpu_id,
name = e.name,
sstate = "TRACE_%s_ENABLED" % e.name.upper(),
diff --git a/scripts/tracetool/format/events_h.py b/scripts/tracetool/format/events_h.py
index 35cbc91..857fcd4 100644
--- a/scripts/tracetool/format/events_h.py
+++ b/scripts/tracetool/format/events_h.py
@@ -31,13 +31,6 @@ def generate(events, backend):
for e in events:
out('extern uint16_t %s;' % e.api(e.QEMU_DSTATE))
- numvcpu = 0
- for e in events:
- if "vcpu" in e.properties:
- numvcpu += 1
-
- out("#define TRACE_VCPU_EVENT_COUNT %d" % numvcpu)
-
# static state
for e in events:
if 'disable' in e.properties:
diff --git a/trace/control.c b/trace/control.c
index 0633774..07912bd 100644
--- a/trace/control.c
+++ b/trace/control.c
@@ -35,6 +35,8 @@ typedef struct TraceEventGroup {
static TraceEventGroup *event_groups;
static size_t nevent_groups;
+static uint32_t next_id;
+static uint32_t next_vcpu_id;
QemuOptsList qemu_trace_opts = {
.name = "trace",
@@ -59,6 +61,13 @@ QemuOptsList qemu_trace_opts = {
void trace_event_register_group(TraceEvent **events)
{
+ size_t i;
+ for (i = 0; events[i] != NULL; i++) {
+ events[i]->id = next_id++;
+ if (events[i]->vcpu_id != TRACE_VCPU_EVENT_NONE) {
+ events[i]->vcpu_id = next_vcpu_id++;
+ }
+ }
event_groups = g_renew(TraceEventGroup, event_groups, nevent_groups + 1);
event_groups[nevent_groups].events = events;
nevent_groups++;
@@ -322,5 +331,5 @@ void trace_init_vcpu_events(void)
uint32_t trace_get_vcpu_event_count(void)
{
- return TRACE_VCPU_EVENT_COUNT;
+ return next_vcpu_id;
}
--
2.7.4
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [Qemu-devel] [PATCH v3 14/18] trace: get rid of generated-events.h/generated-events.c
2016-09-19 14:48 [Qemu-devel] [PATCH v3 00/18] Refactor trace to allow modular build Daniel P. Berrange
` (12 preceding siblings ...)
2016-09-19 14:49 ` [Qemu-devel] [PATCH v3 13/18] trace: dynamically allocate event IDs at runtime Daniel P. Berrange
@ 2016-09-19 14:49 ` Daniel P. Berrange
2016-09-19 16:02 ` Eric Blake
2016-09-19 18:12 ` Lluís Vilanova
2016-09-19 14:49 ` [Qemu-devel] [PATCH v3 15/18] trace: rename _read_events to read_events Daniel P. Berrange
` (5 subsequent siblings)
19 siblings, 2 replies; 48+ messages in thread
From: Daniel P. Berrange @ 2016-09-19 14:49 UTC (permalink / raw)
To: qemu-devel; +Cc: Stefan Hajnoczi, Lluís Vilanova, Daniel P. Berrange
Currently the generated-events.[ch] files contain the
event dstates, constants and TraceEvent structs, while the
generated-tracers.[ch] files contain the actual trace
probe logic. With the removal of usage of the event enums
from the API there is no longer any compelling reason for
the separation between these files. The generated-events.h
content is only ever be needed from the generated-tracers.[ch]
files.
The enums/constants/structs from generated-events.[ch] are
thus moved into the generated-tracers.[ch], so that there
is one less file to be generated.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
Makefile | 3 ---
include/trace-tcg.h | 1 -
include/trace.h | 1 -
scripts/tracetool/format/c.py | 51 ++++++++++++++++++++++++++++++++++++++-----
scripts/tracetool/format/h.py | 19 ++++++++++++++++
trace/Makefile.objs | 28 ++++--------------------
trace/control.h | 2 +-
trace/simple.h | 4 ----
8 files changed, 70 insertions(+), 39 deletions(-)
diff --git a/Makefile b/Makefile
index 50b4b3a..16a35b0 100644
--- a/Makefile
+++ b/Makefile
@@ -56,9 +56,6 @@ GENERATED_SOURCES += qmp-marshal.c qapi-types.c qapi-visit.c qapi-event.c
GENERATED_HEADERS += qmp-introspect.h
GENERATED_SOURCES += qmp-introspect.c
-GENERATED_HEADERS += trace/generated-events.h
-GENERATED_SOURCES += trace/generated-events.c
-
GENERATED_HEADERS += trace/generated-tracers.h
ifeq ($(findstring dtrace,$(TRACE_BACKENDS)),dtrace)
GENERATED_HEADERS += trace/generated-tracers-dtrace.h
diff --git a/include/trace-tcg.h b/include/trace-tcg.h
index edab4b1..da68608 100644
--- a/include/trace-tcg.h
+++ b/include/trace-tcg.h
@@ -2,6 +2,5 @@
#define TRACE_TCG_H
#include "trace/generated-tcg-tracers.h"
-#include "trace/generated-events.h"
#endif /* TRACE_TCG_H */
diff --git a/include/trace.h b/include/trace.h
index 9a01e44..ac9ff3d 100644
--- a/include/trace.h
+++ b/include/trace.h
@@ -2,6 +2,5 @@
#define TRACE_H
#include "trace/generated-tracers.h"
-#include "trace/generated-events.h"
#endif /* TRACE_H */
diff --git a/scripts/tracetool/format/c.py b/scripts/tracetool/format/c.py
index 699598f..24f8d2e 100644
--- a/scripts/tracetool/format/c.py
+++ b/scripts/tracetool/format/c.py
@@ -17,12 +17,53 @@ from tracetool import out
def generate(events, backend):
- events = [e for e in events
- if "disable" not in e.properties]
+ active_events = [e for e in events
+ if "disable" not in e.properties]
out('/* This file is autogenerated by tracetool, do not edit. */',
+ '',
+ '#include "qemu/osdep.h"',
+ '#include "trace.h"',
'')
- backend.generate_begin(events)
- for event in events:
+
+ for e in events:
+ out('uint16_t %s;' % e.api(e.QEMU_DSTATE))
+
+ for e in events:
+ if "vcpu" in e.properties:
+ vcpu_id = 0
+ else:
+ vcpu_id = "TRACE_VCPU_EVENT_NONE"
+ out('TraceEvent %(event)s = {',
+ ' .id = 0,',
+ ' .vcpu_id = %(vcpu_id)s,',
+ ' .name = \"%(name)s\",',
+ ' .sstate = %(sstate)s,',
+ ' .dstate = &%(dstate)s ',
+ '};',
+ event = "TRACE_" + e.name.upper() + "_EV",
+ vcpu_id = vcpu_id,
+ name = e.name,
+ sstate = "TRACE_%s_ENABLED" % e.name.upper(),
+ dstate = e.api(e.QEMU_DSTATE))
+
+ out('TraceEvent *trace_events[] = {')
+
+ for e in events:
+ out('&%(event)s,',
+ event = "TRACE_" + e.name.upper() + "_EV")
+
+ out(' NULL,',
+ '};',
+ '')
+
+ out('static void trace_register_events(void)',
+ '{',
+ ' trace_event_register_group(trace_events);',
+ '}',
+ 'trace_init(trace_register_events)')
+
+ backend.generate_begin(active_events)
+ for event in active_events:
backend.generate(event)
- backend.generate_end(events)
+ backend.generate_end(active_events)
diff --git a/scripts/tracetool/format/h.py b/scripts/tracetool/format/h.py
index 64a6680..f1dc493 100644
--- a/scripts/tracetool/format/h.py
+++ b/scripts/tracetool/format/h.py
@@ -26,6 +26,25 @@ def generate(events, backend):
'#include "trace/control.h"',
'')
+ for e in events:
+ out('extern TraceEvent TRACE_%s_EV;' % e.name.upper())
+
+ for e in events:
+ out('extern uint16_t %s;' % e.api(e.QEMU_DSTATE))
+
+ # static state
+ for e in events:
+ if 'disable' in e.properties:
+ enabled = 0
+ else:
+ enabled = 1
+ if "tcg-exec" in e.properties:
+ # a single define for the two "sub-events"
+ out('#define TRACE_%(name)s_ENABLED %(enabled)d',
+ name=e.original.name.upper(),
+ enabled=enabled)
+ out('#define TRACE_%s_ENABLED %d' % (e.name.upper(), enabled))
+
backend.generate_begin(events)
for e in events:
diff --git a/trace/Makefile.objs b/trace/Makefile.objs
index 4d91b3b..83f754e 100644
--- a/trace/Makefile.objs
+++ b/trace/Makefile.objs
@@ -32,32 +32,11 @@ $(obj)/generated-ust.c-timestamp: $(BUILD_DIR)/trace-events-all $(tracetool-y)
--backends=$(TRACE_BACKENDS) \
< $< > $@," GEN $(patsubst %-timestamp,%,$@)")
-$(obj)/generated-events.h: $(obj)/generated-ust-provider.h
-$(obj)/generated-events.c: $(obj)/generated-ust.c
+$(obj)/generated-tracers.h: $(obj)/generated-ust-provider.h
+$(obj)/generated-tracers.c: $(obj)/generated-ust.c
endif
-######################################################################
-# Auto-generated event descriptions
-
-$(obj)/generated-events.h: $(obj)/generated-events.h-timestamp
- @cmp $< $@ >/dev/null 2>&1 || cp $< $@
-$(obj)/generated-events.h-timestamp: $(BUILD_DIR)/trace-events-all $(tracetool-y)
- $(call quiet-command,$(TRACETOOL) \
- --format=events-h \
- --backends=$(TRACE_BACKENDS) \
- < $< > $@," GEN $(patsubst %-timestamp,%,$@)")
-
-$(obj)/generated-events.c: $(obj)/generated-events.c-timestamp $(BUILD_DIR)/config-host.mak
- @cmp $< $@ >/dev/null 2>&1 || cp $< $@
-$(obj)/generated-events.c-timestamp: $(BUILD_DIR)/trace-events-all $(tracetool-y)
- $(call quiet-command,$(TRACETOOL) \
- --format=events-c \
- --backends=$(TRACE_BACKENDS) \
- < $< > $@," GEN $(patsubst %-timestamp,%,$@)")
-
-util-obj-y += generated-events.o
-
######################################################################
# Auto-generated tracing routines
@@ -154,7 +133,8 @@ $(obj)/generated-tcg-tracers.h-timestamp: $(BUILD_DIR)/trace-events-all $(BUILD_
######################################################################
# Backend code
-util-obj-$(CONFIG_TRACE_SIMPLE) += simple.o generated-tracers.o
+util-obj-y += generated-tracers.o
+util-obj-$(CONFIG_TRACE_SIMPLE) += simple.o
util-obj-$(CONFIG_TRACE_FTRACE) += ftrace.o
util-obj-$(CONFIG_TRACE_UST) += generated-ust.o
util-obj-y += control.o
diff --git a/trace/control.h b/trace/control.h
index 60905f7..93efcbf 100644
--- a/trace/control.h
+++ b/trace/control.h
@@ -11,7 +11,7 @@
#define TRACE__CONTROL_H
#include "qemu-common.h"
-#include "trace/generated-events.h"
+#include "event-internal.h"
typedef struct TraceEventIter {
size_t event;
diff --git a/trace/simple.h b/trace/simple.h
index 17ce472..9931808 100644
--- a/trace/simple.h
+++ b/trace/simple.h
@@ -11,10 +11,6 @@
#ifndef TRACE_SIMPLE_H
#define TRACE_SIMPLE_H
-
-#include "trace/generated-events.h"
-
-
void st_print_trace_file_status(FILE *stream, fprintf_function stream_printf);
void st_set_trace_file_enabled(bool enable);
void st_set_trace_file(const char *file);
--
2.7.4
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [Qemu-devel] [PATCH v3 15/18] trace: rename _read_events to read_events
2016-09-19 14:48 [Qemu-devel] [PATCH v3 00/18] Refactor trace to allow modular build Daniel P. Berrange
` (13 preceding siblings ...)
2016-09-19 14:49 ` [Qemu-devel] [PATCH v3 14/18] trace: get rid of generated-events.h/generated-events.c Daniel P. Berrange
@ 2016-09-19 14:49 ` Daniel P. Berrange
2016-09-19 18:15 ` Lluís Vilanova
2016-09-19 14:49 ` [Qemu-devel] [PATCH v3 16/18] trace: push reading of events up a level to tracetool main Daniel P. Berrange
` (4 subsequent siblings)
19 siblings, 1 reply; 48+ messages in thread
From: Daniel P. Berrange @ 2016-09-19 14:49 UTC (permalink / raw)
To: qemu-devel; +Cc: Stefan Hajnoczi, Lluís Vilanova, Daniel P. Berrange
The _read_events method is used by callers outside of
its module, so should be a public method, not private.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
scripts/simpletrace.py | 6 +++---
scripts/tracetool/__init__.py | 14 ++++++++++++--
2 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/scripts/simpletrace.py b/scripts/simpletrace.py
index 98abb7a..5dc71d3 100755
--- a/scripts/simpletrace.py
+++ b/scripts/simpletrace.py
@@ -12,7 +12,7 @@
import struct
import re
import inspect
-from tracetool import _read_events, Event
+from tracetool import read_events, Event
from tracetool.backend.simple import is_string
header_event_id = 0xffffffffffffffff
@@ -128,7 +128,7 @@ class Analyzer(object):
def process(events, log, analyzer, read_header=True):
"""Invoke an analyzer on each event in a log."""
if isinstance(events, str):
- events = _read_events(open(events, 'r'))
+ events = read_events(open(events, 'r'))
if isinstance(log, str):
log = open(log, 'rb')
@@ -187,7 +187,7 @@ def run(analyzer):
'<trace-file>\n' % sys.argv[0])
sys.exit(1)
- events = _read_events(open(sys.argv[1], 'r'))
+ events = read_events(open(sys.argv[1], 'r'))
process(events, sys.argv[2], analyzer, read_header=read_header)
if __name__ == '__main__':
diff --git a/scripts/tracetool/__init__.py b/scripts/tracetool/__init__.py
index 5191df9..1bb3886 100644
--- a/scripts/tracetool/__init__.py
+++ b/scripts/tracetool/__init__.py
@@ -281,7 +281,17 @@ class Event(object):
self)
-def _read_events(fobj):
+def read_events(fobj):
+ """Generate the output for the given (format, backends) pair.
+
+ Parameters
+ ----------
+ fobj : file
+ Event description file.
+
+ Returns a list of Event objects
+ """
+
events = []
for line in fobj:
if not line.strip():
@@ -390,6 +400,6 @@ def generate(fevents, format, backends,
tracetool.backend.dtrace.BINARY = binary
tracetool.backend.dtrace.PROBEPREFIX = probe_prefix
- events = _read_events(fevents)
+ events = read_events(fevents)
tracetool.format.generate(events, format, backend)
--
2.7.4
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [Qemu-devel] [PATCH v3 16/18] trace: push reading of events up a level to tracetool main
2016-09-19 14:48 [Qemu-devel] [PATCH v3 00/18] Refactor trace to allow modular build Daniel P. Berrange
` (14 preceding siblings ...)
2016-09-19 14:49 ` [Qemu-devel] [PATCH v3 15/18] trace: rename _read_events to read_events Daniel P. Berrange
@ 2016-09-19 14:49 ` Daniel P. Berrange
2016-09-19 18:16 ` Lluís Vilanova
2016-09-19 14:49 ` [Qemu-devel] [PATCH v3 17/18] trace: pass trace-events to tracetool as a positional param Daniel P. Berrange
` (3 subsequent siblings)
19 siblings, 1 reply; 48+ messages in thread
From: Daniel P. Berrange @ 2016-09-19 14:49 UTC (permalink / raw)
To: qemu-devel; +Cc: Stefan Hajnoczi, Lluís Vilanova, Daniel P. Berrange
Move the reading of events out of the 'tracetool.generate'
method and into tracetool.main, so that the latter is not
tied to generating from a single source of events.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
scripts/tracetool.py | 4 +++-
scripts/tracetool/__init__.py | 8 +++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/scripts/tracetool.py b/scripts/tracetool.py
index 7b82959..6accbbf 100755
--- a/scripts/tracetool.py
+++ b/scripts/tracetool.py
@@ -129,8 +129,10 @@ def main(args):
if probe_prefix is None:
probe_prefix = ".".join(["qemu", target_type, target_name])
+ events = tracetool.read_events(sys.stdin)
+
try:
- tracetool.generate(sys.stdin, arg_format, arg_backends,
+ tracetool.generate(events, arg_format, arg_backends,
binary=binary, probe_prefix=probe_prefix)
except tracetool.TracetoolError as e:
error_opt(str(e))
diff --git a/scripts/tracetool/__init__.py b/scripts/tracetool/__init__.py
index 1bb3886..ed668a1 100644
--- a/scripts/tracetool/__init__.py
+++ b/scripts/tracetool/__init__.py
@@ -363,14 +363,14 @@ def try_import(mod_name, attr_name=None, attr_default=None):
return False, None
-def generate(fevents, format, backends,
+def generate(events, format, backends,
binary=None, probe_prefix=None):
"""Generate the output for the given (format, backends) pair.
Parameters
----------
- fevents : file
- Event description file.
+ events : list
+ list of Event objects to generate for
format : str
Output format name.
backends : list
@@ -400,6 +400,4 @@ def generate(fevents, format, backends,
tracetool.backend.dtrace.BINARY = binary
tracetool.backend.dtrace.PROBEPREFIX = probe_prefix
- events = read_events(fevents)
-
tracetool.format.generate(events, format, backend)
--
2.7.4
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [Qemu-devel] [PATCH v3 17/18] trace: pass trace-events to tracetool as a positional param
2016-09-19 14:48 [Qemu-devel] [PATCH v3 00/18] Refactor trace to allow modular build Daniel P. Berrange
` (15 preceding siblings ...)
2016-09-19 14:49 ` [Qemu-devel] [PATCH v3 16/18] trace: push reading of events up a level to tracetool main Daniel P. Berrange
@ 2016-09-19 14:49 ` Daniel P. Berrange
2016-09-19 18:18 ` Lluís Vilanova
2016-09-19 14:49 ` [Qemu-devel] [PATCH v3 18/18] trace: introduce a formal group name for trace events Daniel P. Berrange
` (2 subsequent siblings)
19 siblings, 1 reply; 48+ messages in thread
From: Daniel P. Berrange @ 2016-09-19 14:49 UTC (permalink / raw)
To: qemu-devel; +Cc: Stefan Hajnoczi, Lluís Vilanova, Daniel P. Berrange
Instead of reading the contents of 'trace-events' from stdin,
accept the filename as a positional parameter. This also
allows for reading from multiple files, though this facility
is not used at this time.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
Makefile.target | 6 +++---
scripts/tracetool.py | 5 ++++-
trace/Makefile.objs | 18 +++++++++---------
3 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/Makefile.target b/Makefile.target
index 8c7a072..f227408 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -55,7 +55,7 @@ $(QEMU_PROG).stp-installed: $(BUILD_DIR)/trace-events-all
--binary=$(bindir)/$(QEMU_PROG) \
--target-name=$(TARGET_NAME) \
--target-type=$(TARGET_TYPE) \
- < $< > $@," GEN $(TARGET_DIR)$(QEMU_PROG).stp-installed")
+ $< > $@," GEN $(TARGET_DIR)$(QEMU_PROG).stp-installed")
$(QEMU_PROG).stp: $(BUILD_DIR)/trace-events-all
$(call quiet-command,$(TRACETOOL) \
@@ -64,14 +64,14 @@ $(QEMU_PROG).stp: $(BUILD_DIR)/trace-events-all
--binary=$(realpath .)/$(QEMU_PROG) \
--target-name=$(TARGET_NAME) \
--target-type=$(TARGET_TYPE) \
- < $< > $@," GEN $(TARGET_DIR)$(QEMU_PROG).stp")
+ $< > $@," GEN $(TARGET_DIR)$(QEMU_PROG).stp")
$(QEMU_PROG)-simpletrace.stp: $(BUILD_DIR)/trace-events-all
$(call quiet-command,$(TRACETOOL) \
--format=simpletrace-stap \
--backends=$(TRACE_BACKENDS) \
--probe-prefix=qemu.$(TARGET_TYPE).$(TARGET_NAME) \
- < $< > $@," GEN $(TARGET_DIR)$(QEMU_PROG)-simpletrace.stp")
+ $< > $@," GEN $(TARGET_DIR)$(QEMU_PROG)-simpletrace.stp")
else
stap:
diff --git a/scripts/tracetool.py b/scripts/tracetool.py
index 6accbbf..f66e767 100755
--- a/scripts/tracetool.py
+++ b/scripts/tracetool.py
@@ -129,7 +129,10 @@ def main(args):
if probe_prefix is None:
probe_prefix = ".".join(["qemu", target_type, target_name])
- events = tracetool.read_events(sys.stdin)
+ if len(args) != 1:
+ error_opt("missing trace-events filepath")
+ with open(args[0], "r") as fh:
+ events = tracetool.read_events(fh)
try:
tracetool.generate(events, arg_format, arg_backends,
diff --git a/trace/Makefile.objs b/trace/Makefile.objs
index 83f754e..524c4c9 100644
--- a/trace/Makefile.objs
+++ b/trace/Makefile.objs
@@ -22,7 +22,7 @@ $(obj)/generated-ust-provider.h-timestamp: $(BUILD_DIR)/trace-events-all $(trace
$(call quiet-command,$(TRACETOOL) \
--format=ust-events-h \
--backends=$(TRACE_BACKENDS) \
- < $< > $@," GEN $(patsubst %-timestamp,%,$@)")
+ $< > $@," GEN $(patsubst %-timestamp,%,$@)")
$(obj)/generated-ust.c: $(obj)/generated-ust.c-timestamp $(BUILD_DIR)/config-host.mak
@cmp $< $@ >/dev/null 2>&1 || cp $< $@
@@ -30,7 +30,7 @@ $(obj)/generated-ust.c-timestamp: $(BUILD_DIR)/trace-events-all $(tracetool-y)
$(call quiet-command,$(TRACETOOL) \
--format=ust-events-c \
--backends=$(TRACE_BACKENDS) \
- < $< > $@," GEN $(patsubst %-timestamp,%,$@)")
+ $< > $@," GEN $(patsubst %-timestamp,%,$@)")
$(obj)/generated-tracers.h: $(obj)/generated-ust-provider.h
$(obj)/generated-tracers.c: $(obj)/generated-ust.c
@@ -50,7 +50,7 @@ $(obj)/generated-tracers.h-timestamp: $(BUILD_DIR)/trace-events-all $(BUILD_DIR)
$(call quiet-command,$(TRACETOOL) \
--format=h \
--backends=$(TRACE_BACKENDS) \
- < $< > $@," GEN $(patsubst %-timestamp,%,$@)")
+ $< > $@," GEN $(patsubst %-timestamp,%,$@)")
##############################
# non-DTrace
@@ -61,7 +61,7 @@ $(obj)/generated-tracers.c-timestamp: $(BUILD_DIR)/trace-events-all $(BUILD_DIR)
$(call quiet-command,$(TRACETOOL) \
--format=c \
--backends=$(TRACE_BACKENDS) \
- < $< > $@," GEN $(patsubst %-timestamp,%,$@)")
+ $< > $@," GEN $(patsubst %-timestamp,%,$@)")
$(obj)/generated-tracers.o: $(obj)/generated-tracers.c $(obj)/generated-tracers.h
@@ -79,7 +79,7 @@ $(obj)/generated-tracers-dtrace.dtrace-timestamp: $(BUILD_DIR)/trace-events-all
$(call quiet-command,$(TRACETOOL) \
--format=d \
--backends=$(TRACE_BACKENDS) \
- < $< > $@," GEN $(patsubst %-timestamp,%,$@)")
+ $< > $@," GEN $(patsubst %-timestamp,%,$@)")
$(obj)/generated-tracers-dtrace.h: $(obj)/generated-tracers-dtrace.dtrace
$(call quiet-command,dtrace -o $@ -h -s $<, " GEN $@")
@@ -98,7 +98,7 @@ $(obj)/generated-helpers-wrappers.h-timestamp: $(BUILD_DIR)/trace-events-all $(B
$(call quiet-command,$(TRACETOOL) \
--format=tcg-helper-wrapper-h \
--backend=$(TRACE_BACKENDS) \
- < $< > $@," GEN $(patsubst %-timestamp,%,$@)")
+ $< > $@," GEN $(patsubst %-timestamp,%,$@)")
$(obj)/generated-helpers.h: $(obj)/generated-helpers.h-timestamp
@cmp $< $@ >/dev/null 2>&1 || cp $< $@
@@ -106,7 +106,7 @@ $(obj)/generated-helpers.h-timestamp: $(BUILD_DIR)/trace-events-all $(BUILD_DIR)
$(call quiet-command,$(TRACETOOL) \
--format=tcg-helper-h \
--backend=$(TRACE_BACKENDS) \
- < $< > $@," GEN $(patsubst %-timestamp,%,$@)")
+ $< > $@," GEN $(patsubst %-timestamp,%,$@)")
$(obj)/generated-helpers.c: $(obj)/generated-helpers.c-timestamp
@cmp $< $@ >/dev/null 2>&1 || cp $< $@
@@ -114,7 +114,7 @@ $(obj)/generated-helpers.c-timestamp: $(BUILD_DIR)/trace-events-all $(BUILD_DIR)
$(call quiet-command,$(TRACETOOL) \
--format=tcg-helper-c \
--backend=$(TRACE_BACKENDS) \
- < $< > $@," GEN $(patsubst %-timestamp,%,$@)")
+ $< > $@," GEN $(patsubst %-timestamp,%,$@)")
$(obj)/generated-helpers.o: $(obj)/generated-helpers.c
@@ -127,7 +127,7 @@ $(obj)/generated-tcg-tracers.h-timestamp: $(BUILD_DIR)/trace-events-all $(BUILD_
$(call quiet-command,$(TRACETOOL) \
--format=tcg-h \
--backend=$(TRACE_BACKENDS) \
- < $< > $@," GEN $(patsubst %-timestamp,%,$@)")
+ $< > $@," GEN $(patsubst %-timestamp,%,$@)")
######################################################################
--
2.7.4
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [Qemu-devel] [PATCH v3 18/18] trace: introduce a formal group name for trace events
2016-09-19 14:48 [Qemu-devel] [PATCH v3 00/18] Refactor trace to allow modular build Daniel P. Berrange
` (16 preceding siblings ...)
2016-09-19 14:49 ` [Qemu-devel] [PATCH v3 17/18] trace: pass trace-events to tracetool as a positional param Daniel P. Berrange
@ 2016-09-19 14:49 ` Daniel P. Berrange
2016-09-19 18:27 ` Lluís Vilanova
2016-09-19 15:54 ` [Qemu-devel] [PATCH v3 00/18] Refactor trace to allow modular build no-reply
2016-09-19 17:13 ` no-reply
19 siblings, 1 reply; 48+ messages in thread
From: Daniel P. Berrange @ 2016-09-19 14:49 UTC (permalink / raw)
To: qemu-devel; +Cc: Stefan Hajnoczi, Lluís Vilanova, Daniel P. Berrange
The declarations in the generated-tracers.h file are
assuming there's only ever going to be one instance
of this header, as they are not namespaced. When we
have one header per event group, if a single source
file needs to include multiple sets of trace events,
the symbols will all clash.
This change thus introduces a '--group NAME' arg to the
'tracetool' program. This will cause all the symbols in
the generated header files to be given a unique namespace.
If no group is given, the group name 'common' is used,
which is suitable for the current usage where there is
only one global trace-events file used for code generation.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
scripts/tracetool.py | 24 +++++++++++++++++++++++-
scripts/tracetool/__init__.py | 6 ++++--
scripts/tracetool/backend/__init__.py | 12 ++++++------
scripts/tracetool/backend/dtrace.py | 4 ++--
scripts/tracetool/backend/ftrace.py | 5 +++--
scripts/tracetool/backend/log.py | 4 ++--
scripts/tracetool/backend/simple.py | 8 ++++----
scripts/tracetool/backend/syslog.py | 4 ++--
scripts/tracetool/backend/ust.py | 4 ++--
scripts/tracetool/format/__init__.py | 4 ++--
scripts/tracetool/format/c.py | 18 ++++++++++--------
scripts/tracetool/format/d.py | 2 +-
scripts/tracetool/format/h.py | 14 +++++++-------
scripts/tracetool/format/simpletrace_stap.py | 2 +-
scripts/tracetool/format/stap.py | 2 +-
scripts/tracetool/format/tcg_h.py | 2 +-
scripts/tracetool/format/tcg_helper_c.py | 2 +-
scripts/tracetool/format/tcg_helper_h.py | 2 +-
scripts/tracetool/format/tcg_helper_wrapper_h.py | 2 +-
scripts/tracetool/format/ust_events_c.py | 2 +-
scripts/tracetool/format/ust_events_h.py | 8 ++++----
21 files changed, 79 insertions(+), 52 deletions(-)
diff --git a/scripts/tracetool.py b/scripts/tracetool.py
index f66e767..0ee66f3 100755
--- a/scripts/tracetool.py
+++ b/scripts/tracetool.py
@@ -15,6 +15,8 @@ __email__ = "stefanha@linux.vnet.ibm.com"
import sys
import getopt
+import os.path
+import re
from tracetool import error_write, out
import tracetool.backend
@@ -60,6 +62,24 @@ Options:
else:
sys.exit(1)
+def find_git_root(dirname):
+ while dirname != "":
+ git = os.path.join(dirname, ".git")
+ if os.path.exists(git):
+ return dirname
+ dirname = os.path.dirname(dirname)
+
+ raise ValueError("Cannot find .git directory for %s",
+ filename)
+
+def make_group_name(filename):
+ dirname = os.path.dirname(filename)
+ gitdir = find_git_root(dirname)
+ dirname = dirname[len(gitdir):]
+
+ if dirname == "":
+ return "common"
+ return re.sub(r"/|-", "_", dirname)
def main(args):
global _SCRIPT
@@ -134,8 +154,10 @@ def main(args):
with open(args[0], "r") as fh:
events = tracetool.read_events(fh)
+ group = make_group_name(args[0])
+
try:
- tracetool.generate(events, arg_format, arg_backends,
+ tracetool.generate(events, group, arg_format, arg_backends,
binary=binary, probe_prefix=probe_prefix)
except tracetool.TracetoolError as e:
error_opt(str(e))
diff --git a/scripts/tracetool/__init__.py b/scripts/tracetool/__init__.py
index ed668a1..be8a360 100644
--- a/scripts/tracetool/__init__.py
+++ b/scripts/tracetool/__init__.py
@@ -363,7 +363,7 @@ def try_import(mod_name, attr_name=None, attr_default=None):
return False, None
-def generate(events, format, backends,
+def generate(events, group, format, backends,
binary=None, probe_prefix=None):
"""Generate the output for the given (format, backends) pair.
@@ -371,6 +371,8 @@ def generate(events, format, backends,
----------
events : list
list of Event objects to generate for
+ group: str
+ Name of the tracing group
format : str
Output format name.
backends : list
@@ -400,4 +402,4 @@ def generate(events, format, backends,
tracetool.backend.dtrace.BINARY = binary
tracetool.backend.dtrace.PROBEPREFIX = probe_prefix
- tracetool.format.generate(events, format, backend)
+ tracetool.format.generate(events, format, backend, group)
diff --git a/scripts/tracetool/backend/__init__.py b/scripts/tracetool/backend/__init__.py
index d4b6dab..f735a25 100644
--- a/scripts/tracetool/backend/__init__.py
+++ b/scripts/tracetool/backend/__init__.py
@@ -113,11 +113,11 @@ class Wrapper:
if func is not None:
func(*args, **kwargs)
- def generate_begin(self, events):
- self._run_function("generate_%s_begin", events)
+ def generate_begin(self, events, group):
+ self._run_function("generate_%s_begin", events, group)
- def generate(self, event):
- self._run_function("generate_%s", event)
+ def generate(self, event, group):
+ self._run_function("generate_%s", event, group)
- def generate_end(self, events):
- self._run_function("generate_%s_end", events)
+ def generate_end(self, events, group):
+ self._run_function("generate_%s_end", events, group)
diff --git a/scripts/tracetool/backend/dtrace.py b/scripts/tracetool/backend/dtrace.py
index ab9ecfa..79505c6 100644
--- a/scripts/tracetool/backend/dtrace.py
+++ b/scripts/tracetool/backend/dtrace.py
@@ -35,12 +35,12 @@ def binary():
return BINARY
-def generate_h_begin(events):
+def generate_h_begin(events, group):
out('#include "trace/generated-tracers-dtrace.h"',
'')
-def generate_h(event):
+def generate_h(event, group):
out(' QEMU_%(uppername)s(%(argnames)s);',
uppername=event.name.upper(),
argnames=", ".join(event.args.names()))
diff --git a/scripts/tracetool/backend/ftrace.py b/scripts/tracetool/backend/ftrace.py
index 4b83b44..8ee1a20 100644
--- a/scripts/tracetool/backend/ftrace.py
+++ b/scripts/tracetool/backend/ftrace.py
@@ -19,12 +19,12 @@ from tracetool import out
PUBLIC = True
-def generate_h_begin(events):
+def generate_h_begin(events, group):
out('#include "trace/ftrace.h"',
'')
-def generate_h(event):
+def generate_h(event, group):
argnames = ", ".join(event.args.names())
if len(event.args) > 0:
argnames = ", " + argnames
@@ -40,6 +40,7 @@ def generate_h(event):
' unused = write(trace_marker_fd, ftrace_buf, trlen);',
' }',
' }',
+ group=group.lower(),
name=event.name,
args=event.args,
event_id="TRACE_" + event.name.upper(),
diff --git a/scripts/tracetool/backend/log.py b/scripts/tracetool/backend/log.py
index 426bb6e..4f4a4d3 100644
--- a/scripts/tracetool/backend/log.py
+++ b/scripts/tracetool/backend/log.py
@@ -19,12 +19,12 @@ from tracetool import out
PUBLIC = True
-def generate_h_begin(events):
+def generate_h_begin(events, group):
out('#include "qemu/log.h"',
'')
-def generate_h(event):
+def generate_h(event, group):
argnames = ", ".join(event.args.names())
if len(event.args) > 0:
argnames = ", " + argnames
diff --git a/scripts/tracetool/backend/simple.py b/scripts/tracetool/backend/simple.py
index 971bd97..b0db50c 100644
--- a/scripts/tracetool/backend/simple.py
+++ b/scripts/tracetool/backend/simple.py
@@ -27,7 +27,7 @@ def is_string(arg):
return False
-def generate_h_begin(events):
+def generate_h_begin(events, group):
for event in events:
out('void _simple_%(api)s(%(args)s);',
api=event.api(),
@@ -35,13 +35,13 @@ def generate_h_begin(events):
out('')
-def generate_h(event):
+def generate_h(event, group):
out(' _simple_%(api)s(%(args)s);',
api=event.api(),
args=", ".join(event.args.names()))
-def generate_c_begin(events):
+def generate_c_begin(events, group):
out('#include "qemu/osdep.h"',
'#include "trace.h"',
'#include "trace/control.h"',
@@ -49,7 +49,7 @@ def generate_c_begin(events):
'')
-def generate_c(event):
+def generate_c(event, group):
out('void _simple_%(api)s(%(args)s)',
'{',
' TraceBufferRecord rec;',
diff --git a/scripts/tracetool/backend/syslog.py b/scripts/tracetool/backend/syslog.py
index 5f693bd..b8ff279 100644
--- a/scripts/tracetool/backend/syslog.py
+++ b/scripts/tracetool/backend/syslog.py
@@ -19,12 +19,12 @@ from tracetool import out
PUBLIC = True
-def generate_h_begin(events):
+def generate_h_begin(events, group):
out('#include <syslog.h>',
'')
-def generate_h(event):
+def generate_h(event, group):
argnames = ", ".join(event.args.names())
if len(event.args) > 0:
argnames = ", " + argnames
diff --git a/scripts/tracetool/backend/ust.py b/scripts/tracetool/backend/ust.py
index ed4c227..4594db6 100644
--- a/scripts/tracetool/backend/ust.py
+++ b/scripts/tracetool/backend/ust.py
@@ -19,13 +19,13 @@ from tracetool import out
PUBLIC = True
-def generate_h_begin(events):
+def generate_h_begin(events, group):
out('#include <lttng/tracepoint.h>',
'#include "trace/generated-ust-provider.h"',
'')
-def generate_h(event):
+def generate_h(event, group):
argnames = ", ".join(event.args.names())
if len(event.args) > 0:
argnames = ", " + argnames
diff --git a/scripts/tracetool/format/__init__.py b/scripts/tracetool/format/__init__.py
index 812570f..cf6e0e2 100644
--- a/scripts/tracetool/format/__init__.py
+++ b/scripts/tracetool/format/__init__.py
@@ -74,7 +74,7 @@ def exists(name):
return tracetool.try_import("tracetool.format." + name)[1]
-def generate(events, format, backend):
+def generate(events, format, backend, group):
if not exists(format):
raise ValueError("unknown format: %s" % format)
format = format.replace("-", "_")
@@ -82,4 +82,4 @@ def generate(events, format, backend):
"generate")[1]
if func is None:
raise AttributeError("format has no 'generate': %s" % format)
- func(events, backend)
+ func(events, backend, group)
diff --git a/scripts/tracetool/format/c.py b/scripts/tracetool/format/c.py
index 24f8d2e..31438fa 100644
--- a/scripts/tracetool/format/c.py
+++ b/scripts/tracetool/format/c.py
@@ -16,7 +16,7 @@ __email__ = "stefanha@linux.vnet.ibm.com"
from tracetool import out
-def generate(events, backend):
+def generate(events, backend, group):
active_events = [e for e in events
if "disable" not in e.properties]
@@ -47,7 +47,8 @@ def generate(events, backend):
sstate = "TRACE_%s_ENABLED" % e.name.upper(),
dstate = e.api(e.QEMU_DSTATE))
- out('TraceEvent *trace_events[] = {')
+ out('TraceEvent *%(group)s_trace_events[] = {',
+ group = group.lower())
for e in events:
out('&%(event)s,',
@@ -57,13 +58,14 @@ def generate(events, backend):
'};',
'')
- out('static void trace_register_events(void)',
+ out('static void trace_%(group)s_register_events(void)',
'{',
- ' trace_event_register_group(trace_events);',
+ ' trace_event_register_group(%(group)s_trace_events);',
'}',
- 'trace_init(trace_register_events)')
+ 'trace_init(trace_%(group)s_register_events)',
+ group = group.lower())
- backend.generate_begin(active_events)
+ backend.generate_begin(active_events, group)
for event in active_events:
- backend.generate(event)
- backend.generate_end(active_events)
+ backend.generate(event, group)
+ backend.generate_end(active_events, group)
diff --git a/scripts/tracetool/format/d.py b/scripts/tracetool/format/d.py
index c77d5b7..78397c2 100644
--- a/scripts/tracetool/format/d.py
+++ b/scripts/tracetool/format/d.py
@@ -29,7 +29,7 @@ RESERVED_WORDS = (
)
-def generate(events, backend):
+def generate(events, backend, group):
events = [e for e in events
if "disable" not in e.properties]
diff --git a/scripts/tracetool/format/h.py b/scripts/tracetool/format/h.py
index f1dc493..3f1d5e9 100644
--- a/scripts/tracetool/format/h.py
+++ b/scripts/tracetool/format/h.py
@@ -16,11 +16,11 @@ __email__ = "stefanha@linux.vnet.ibm.com"
from tracetool import out
-def generate(events, backend):
+def generate(events, backend, group):
out('/* This file is autogenerated by tracetool, do not edit. */',
'',
- '#ifndef TRACE__GENERATED_TRACERS_H',
- '#define TRACE__GENERATED_TRACERS_H',
+ '#ifndef TRACE_%s_GENERATED_TRACERS_H' % group.upper(),
+ '#define TRACE_%s_GENERATED_TRACERS_H' % group.upper(),
'',
'#include "qemu-common.h"',
'#include "trace/control.h"',
@@ -45,7 +45,7 @@ def generate(events, backend):
enabled=enabled)
out('#define TRACE_%s_ENABLED %d' % (e.name.upper(), enabled))
- backend.generate_begin(events)
+ backend.generate_begin(events, group)
for e in events:
if "vcpu" in e.properties:
@@ -67,11 +67,11 @@ def generate(events, backend):
cond=cond)
if "disable" not in e.properties:
- backend.generate(e)
+ backend.generate(e, group)
out(' }',
'}')
- backend.generate_end(events)
+ backend.generate_end(events, group)
- out('#endif /* TRACE__GENERATED_TRACERS_H */')
+ out('#endif /* TRACE_%s_GENERATED_TRACERS_H */' % group.upper())
diff --git a/scripts/tracetool/format/simpletrace_stap.py b/scripts/tracetool/format/simpletrace_stap.py
index 0573f43..3d700ca 100644
--- a/scripts/tracetool/format/simpletrace_stap.py
+++ b/scripts/tracetool/format/simpletrace_stap.py
@@ -19,7 +19,7 @@ from tracetool.backend.simple import is_string
from tracetool.format.stap import stap_escape
-def generate(events, backend):
+def generate(events, backend, group):
out('/* This file is autogenerated by tracetool, do not edit. */',
'',
'global event_name_to_id_map',
diff --git a/scripts/tracetool/format/stap.py b/scripts/tracetool/format/stap.py
index 9e780f1..e8ef3e7 100644
--- a/scripts/tracetool/format/stap.py
+++ b/scripts/tracetool/format/stap.py
@@ -34,7 +34,7 @@ def stap_escape(identifier):
return identifier
-def generate(events, backend):
+def generate(events, backend, group):
events = [e for e in events
if "disable" not in e.properties]
diff --git a/scripts/tracetool/format/tcg_h.py b/scripts/tracetool/format/tcg_h.py
index e2331f2..628388a 100644
--- a/scripts/tracetool/format/tcg_h.py
+++ b/scripts/tracetool/format/tcg_h.py
@@ -27,7 +27,7 @@ def vcpu_transform_args(args):
])
-def generate(events, backend):
+def generate(events, backend, group):
out('/* This file is autogenerated by tracetool, do not edit. */',
'/* You must include this file after the inclusion of helper.h */',
'',
diff --git a/scripts/tracetool/format/tcg_helper_c.py b/scripts/tracetool/format/tcg_helper_c.py
index e3485b7..cc26e03 100644
--- a/scripts/tracetool/format/tcg_helper_c.py
+++ b/scripts/tracetool/format/tcg_helper_c.py
@@ -40,7 +40,7 @@ def vcpu_transform_args(args, mode):
assert False
-def generate(events, backend):
+def generate(events, backend, group):
events = [e for e in events
if "disable" not in e.properties]
diff --git a/scripts/tracetool/format/tcg_helper_h.py b/scripts/tracetool/format/tcg_helper_h.py
index dc76c15..6b184b6 100644
--- a/scripts/tracetool/format/tcg_helper_h.py
+++ b/scripts/tracetool/format/tcg_helper_h.py
@@ -18,7 +18,7 @@ from tracetool.transform import *
import tracetool.vcpu
-def generate(events, backend):
+def generate(events, backend, group):
events = [e for e in events
if "disable" not in e.properties]
diff --git a/scripts/tracetool/format/tcg_helper_wrapper_h.py b/scripts/tracetool/format/tcg_helper_wrapper_h.py
index 020f442..ff53447 100644
--- a/scripts/tracetool/format/tcg_helper_wrapper_h.py
+++ b/scripts/tracetool/format/tcg_helper_wrapper_h.py
@@ -18,7 +18,7 @@ from tracetool.transform import *
import tracetool.vcpu
-def generate(events, backend):
+def generate(events, backend, group):
events = [e for e in events
if "disable" not in e.properties]
diff --git a/scripts/tracetool/format/ust_events_c.py b/scripts/tracetool/format/ust_events_c.py
index 9967c7a..cd87d8a 100644
--- a/scripts/tracetool/format/ust_events_c.py
+++ b/scripts/tracetool/format/ust_events_c.py
@@ -16,7 +16,7 @@ __email__ = "stefanha@redhat.com"
from tracetool import out
-def generate(events, backend):
+def generate(events, backend, group):
events = [e for e in events
if "disabled" not in e.properties]
diff --git a/scripts/tracetool/format/ust_events_h.py b/scripts/tracetool/format/ust_events_h.py
index 3e8a7cd..00b69d9 100644
--- a/scripts/tracetool/format/ust_events_h.py
+++ b/scripts/tracetool/format/ust_events_h.py
@@ -16,7 +16,7 @@ __email__ = "stefanha@redhat.com"
from tracetool import out
-def generate(events, backend):
+def generate(events, backend, group):
events = [e for e in events
if "disabled" not in e.properties]
@@ -28,8 +28,8 @@ def generate(events, backend):
'#undef TRACEPOINT_INCLUDE_FILE',
'#define TRACEPOINT_INCLUDE_FILE ./generated-ust-provider.h',
'',
- '#if !defined (TRACE__GENERATED_UST_H) || defined(TRACEPOINT_HEADER_MULTI_READ)',
- '#define TRACE__GENERATED_UST_H',
+ '#if !defined (TRACE_%s_GENERATED_UST_H) || defined(TRACEPOINT_HEADER_MULTI_READ)' % group.upper(),
+ '#define TRACE_%s_GENERATED_UST_H' % group.upper(),
'',
'#include "qemu-common.h"',
'#include <lttng/tracepoint.h>',
@@ -94,7 +94,7 @@ def generate(events, backend):
'',
name=e.name)
- out('#endif /* TRACE__GENERATED_UST_H */',
+ out('#endif /* TRACE_%s_GENERATED_UST_H */' % group.upper(),
'',
'/* This part must be outside ifdef protection */',
'#include <lttng/tracepoint-event.h>')
--
2.7.4
^ permalink raw reply related [flat|nested] 48+ messages in thread
* Re: [Qemu-devel] [PATCH v3 00/18] Refactor trace to allow modular build
2016-09-19 14:48 [Qemu-devel] [PATCH v3 00/18] Refactor trace to allow modular build Daniel P. Berrange
` (17 preceding siblings ...)
2016-09-19 14:49 ` [Qemu-devel] [PATCH v3 18/18] trace: introduce a formal group name for trace events Daniel P. Berrange
@ 2016-09-19 15:54 ` no-reply
2016-09-19 16:00 ` Daniel P. Berrange
2016-09-19 17:13 ` no-reply
19 siblings, 1 reply; 48+ messages in thread
From: no-reply @ 2016-09-19 15:54 UTC (permalink / raw)
To: berrange; +Cc: famz, qemu-devel, vilanova, stefanha
Hi,
Your series seems to have some coding style problems. See output below for
more information:
Type: series
Subject: [Qemu-devel] [PATCH v3 00/18] Refactor trace to allow modular build
Message-id: 1474296549-29171-1-git-send-email-berrange@redhat.com
=== TEST SCRIPT BEGIN ===
#!/bin/bash
BASE=base
n=1
total=$(git log --oneline $BASE.. | wc -l)
failed=0
# Useful git options
git config --local diff.renamelimit 0
git config --local diff.renames True
commits="$(git log --format=%H --reverse $BASE..)"
for c in $commits; do
echo "Checking PATCH $n/$total: $(git show --no-patch --format=%s $c)..."
if ! git show $c --format=email | ./scripts/checkpatch.pl --mailback -; then
failed=1
echo
fi
n=$((n+1))
done
exit $failed
=== TEST SCRIPT END ===
Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
From https://github.com/patchew-project/qemu
* [new tag] patchew/1474299237-1054-1-git-send-email-berrange@redhat.com -> patchew/1474299237-1054-1-git-send-email-berrange@redhat.com
Switched to a new branch 'test'
439b7d5 trace: introduce a formal group name for trace events
97b7a5f trace: pass trace-events to tracetool as a positional param
46f2527 trace: push reading of events up a level to tracetool main
3f822f1 trace: rename _read_events to read_events
20a8ba2 trace: get rid of generated-events.h/generated-events.c
f6a861d trace: dynamically allocate event IDs at runtime
04e85e1 trace: dynamically allocate trace_dstate in CPUState
5ed1755 trace: provide mechanism for registering trace events
3472cce trace: don't abort qemu if ftrace can't be initialized
e1d4a86 trace: emit name <-> ID mapping in simpletrace header
2270adf trace: remove the TraceEventID and TraceEventVCPUID enums
604483a trace: give each trace event a named TraceEvent struct
731385d trace: break circular dependancy in event-internal.h
34a7e6d trace: remove duplicate control.h includes in generated-tracers.h
6af9de1 trace: remove global 'uint16 dstate[]' array
5c47d07 trace: remove some now unused functions
a222901 trace: convert code to use event iterators
6d86092 trace: add trace event iterator APIs
=== OUTPUT BEGIN ===
Checking PATCH 1/18: trace: add trace event iterator APIs...
Checking PATCH 2/18: trace: convert code to use event iterators...
Checking PATCH 3/18: trace: remove some now unused functions...
Checking PATCH 4/18: trace: remove global 'uint16 dstate[]' array...
WARNING: line over 80 characters
#262: FILE: trace/event-internal.h:24:
+ * Interpretation of @dstate depends on wether the event has the 'vcpu' property:
total: 0 errors, 1 warnings, 211 lines checked
Your patch has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
Checking PATCH 5/18: trace: remove duplicate control.h includes in generated-tracers.h...
Checking PATCH 6/18: trace: break circular dependancy in event-internal.h...
Checking PATCH 7/18: trace: give each trace event a named TraceEvent struct...
Checking PATCH 8/18: trace: remove the TraceEventID and TraceEventVCPUID enums...
WARNING: line over 80 characters
#168: FILE: trace/control-internal.h:66:
+ uint32_t vcpu_id)
ERROR: line over 90 characters
#295: FILE: trace/control.h:118:
+ ((id ##_ENABLED) && trace_event_get_vcpu_state_dynamic_by_vcpu_id(vcpu, id ## _EV.vcpu_id))
ERROR: Macros with complex values should be enclosed in parenthesis
#311: FILE: trace/event-internal.h:17:
+#define TRACE_VCPU_EVENT_NONE (uint32_t)-1
WARNING: line over 80 characters
#325: FILE: trace/simple.c:21:
+#define HEADER_EVENT_ID (~(uint64_t)0) /* avoids conflicting with trace event IDs */
total: 2 errors, 2 warnings, 269 lines checked
Your patch has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
Checking PATCH 9/18: trace: emit name <-> ID mapping in simpletrace header...
ERROR: line over 90 characters
#85: FILE: scripts/simpletrace.py:37:
+ """Deserialize a trace record from a file into a tuple (name, timestamp, pid, arg1, ..., arg6)."""
WARNING: line over 80 characters
#119: FILE: scripts/simpletrace.py:70:
+ return get_record(edict, idtoname, rechdr, fobj) # return tuple of record elements
WARNING: line over 80 characters
#190: FILE: scripts/tracetool/format/simpletrace_stap.py:33:
+ ' printf("%%8b%%8b%%4b%%.*s", 0, event_next_id, name_len, name_len, name)',
ERROR: braces {} are necessary for all arms of this statement
#287: FILE: trace/simple.c:293:
+ if (fwrite(&type, sizeof(type), 1, trace_fp) != 1 ||
[...]
total: 2 errors, 2 warnings, 219 lines checked
Your patch has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
Checking PATCH 10/18: trace: don't abort qemu if ftrace can't be initialized...
Checking PATCH 11/18: trace: provide mechanism for registering trace events...
Checking PATCH 12/18: trace: dynamically allocate trace_dstate in CPUState...
WARNING: line over 80 characters
#39: FILE: include/qom/cpu.h:353:
+ * Dynamically allocated based on BITS_TO_LONGS(trace_get_vcpu_event_count())
total: 0 errors, 1 warnings, 64 lines checked
Your patch has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
Checking PATCH 13/18: trace: dynamically allocate event IDs at runtime...
Checking PATCH 14/18: trace: get rid of generated-events.h/generated-events.c...
Checking PATCH 15/18: trace: rename _read_events to read_events...
Checking PATCH 16/18: trace: push reading of events up a level to tracetool main...
Checking PATCH 17/18: trace: pass trace-events to tracetool as a positional param...
Checking PATCH 18/18: trace: introduce a formal group name for trace events...
ERROR: line over 90 characters
#495: FILE: scripts/tracetool/format/ust_events_h.py:31:
+ '#if !defined (TRACE_%s_GENERATED_UST_H) || defined(TRACEPOINT_HEADER_MULTI_READ)' % group.upper(),
total: 1 errors, 0 warnings, 366 lines checked
Your patch has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
=== OUTPUT END ===
Test command exited with code: 1
---
Email generated automatically by Patchew [http://patchew.org/].
Please send your feedback to patchew-devel@freelists.org
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [Qemu-devel] [PATCH v3 04/18] trace: remove global 'uint16 dstate[]' array
2016-09-19 14:48 ` [Qemu-devel] [PATCH v3 04/18] trace: remove global 'uint16 dstate[]' array Daniel P. Berrange
@ 2016-09-19 15:55 ` Eric Blake
2016-09-19 17:05 ` Lluís Vilanova
1 sibling, 0 replies; 48+ messages in thread
From: Eric Blake @ 2016-09-19 15:55 UTC (permalink / raw)
To: Daniel P. Berrange, qemu-devel; +Cc: Lluís Vilanova, Stefan Hajnoczi
[-- Attachment #1: Type: text/plain, Size: 1540 bytes --]
On 09/19/2016 09:48 AM, Daniel P. Berrange wrote:
> Instead of having a global dstate array, declare a single
> 'uint16 TRACE_${EVENT_NAME}_DSTATE' variable for each
> trace event. Record a pointer to this variable in the
> TraceEvent struct too.
>
> By turning trace_event_get_state_dynamic_by_id into a
> macro, this still hits the fast path, and cache affinity
> is ensured by declaring all the uint16 vars adjacent to
> each other.
>
> Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
> ---
> +++ b/scripts/tracetool/__init__.py
> @@ -265,11 +265,12 @@ class Event(object):
>
> QEMU_TRACE = "trace_%(name)s"
> QEMU_TRACE_TCG = QEMU_TRACE + "_tcg"
> + QEMU_DSTATE = "___TRACE_%(NAME)s_DSTATE"
Inconsistent indentation.
> +++ b/trace/control.c
> @@ -28,12 +28,6 @@
> #include "monitor/monitor.h"
>
> int trace_events_enabled_count;
> -/*
> - * Interpretation depends on wether the event has the 'vcpu' property:
Nice - we're nuking a typo while at it...
> +++ b/trace/event-internal.h
> @@ -19,6 +19,11 @@
> * @vcpu_id: Unique per-vCPU event identifier.
> * @name: Event name.
> * @sstate: Static tracing state.
> + * @dstate: Dynamic tracing state
> + *
> + * Interpretation of @dstate depends on wether the event has the 'vcpu' property:
...oh, we just moved it. s/wether/whether/ while touching this.
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 604 bytes --]
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [Qemu-devel] [PATCH v3 00/18] Refactor trace to allow modular build
2016-09-19 15:54 ` [Qemu-devel] [PATCH v3 00/18] Refactor trace to allow modular build no-reply
@ 2016-09-19 16:00 ` Daniel P. Berrange
0 siblings, 0 replies; 48+ messages in thread
From: Daniel P. Berrange @ 2016-09-19 16:00 UTC (permalink / raw)
To: qemu-devel; +Cc: famz, vilanova, stefanha
On Mon, Sep 19, 2016 at 08:54:50AM -0700, no-reply@ec2-52-6-146-230.compute-1.amazonaws.com wrote:
> Hi,
>
> Your series seems to have some coding style problems. See output below for
> more information:
>
> Type: series
> Subject: [Qemu-devel] [PATCH v3 00/18] Refactor trace to allow modular build
> Message-id: 1474296549-29171-1-git-send-email-berrange@redhat.com
>
> === TEST SCRIPT BEGIN ===
> #!/bin/bash
>
> BASE=base
> n=1
> total=$(git log --oneline $BASE.. | wc -l)
> failed=0
>
> # Useful git options
> git config --local diff.renamelimit 0
> git config --local diff.renames True
>
> commits="$(git log --format=%H --reverse $BASE..)"
> for c in $commits; do
> echo "Checking PATCH $n/$total: $(git show --no-patch --format=%s $c)..."
> if ! git show $c --format=email | ./scripts/checkpatch.pl --mailback -; then
> failed=1
> echo
> fi
> n=$((n+1))
> done
>
> exit $failed
> === TEST SCRIPT END ===
>
> Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
> From https://github.com/patchew-project/qemu
> * [new tag] patchew/1474299237-1054-1-git-send-email-berrange@redhat.com -> patchew/1474299237-1054-1-git-send-email-berrange@redhat.com
> Switched to a new branch 'test'
> 439b7d5 trace: introduce a formal group name for trace events
> 97b7a5f trace: pass trace-events to tracetool as a positional param
> 46f2527 trace: push reading of events up a level to tracetool main
> 3f822f1 trace: rename _read_events to read_events
> 20a8ba2 trace: get rid of generated-events.h/generated-events.c
> f6a861d trace: dynamically allocate event IDs at runtime
> 04e85e1 trace: dynamically allocate trace_dstate in CPUState
> 5ed1755 trace: provide mechanism for registering trace events
> 3472cce trace: don't abort qemu if ftrace can't be initialized
> e1d4a86 trace: emit name <-> ID mapping in simpletrace header
> 2270adf trace: remove the TraceEventID and TraceEventVCPUID enums
> 604483a trace: give each trace event a named TraceEvent struct
> 731385d trace: break circular dependancy in event-internal.h
> 34a7e6d trace: remove duplicate control.h includes in generated-tracers.h
> 6af9de1 trace: remove global 'uint16 dstate[]' array
> 5c47d07 trace: remove some now unused functions
> a222901 trace: convert code to use event iterators
> 6d86092 trace: add trace event iterator APIs
>
> === OUTPUT BEGIN ===
> Checking PATCH 1/18: trace: add trace event iterator APIs...
> Checking PATCH 2/18: trace: convert code to use event iterators...
> Checking PATCH 3/18: trace: remove some now unused functions...
> Checking PATCH 4/18: trace: remove global 'uint16 dstate[]' array...
> WARNING: line over 80 characters
> #262: FILE: trace/event-internal.h:24:
> + * Interpretation of @dstate depends on wether the event has the 'vcpu' property:
>
> total: 0 errors, 1 warnings, 211 lines checked
>
> Your patch has style problems, please review. If any of these errors
[snip many more warnings]
The moral of this story is to not trust code you wrote late on a friday
afternoon :-)
Regards,
Daniel
--
|: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org -o- http://virt-manager.org :|
|: http://autobuild.org -o- http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [Qemu-devel] [PATCH v3 14/18] trace: get rid of generated-events.h/generated-events.c
2016-09-19 14:49 ` [Qemu-devel] [PATCH v3 14/18] trace: get rid of generated-events.h/generated-events.c Daniel P. Berrange
@ 2016-09-19 16:02 ` Eric Blake
2016-09-19 18:12 ` Lluís Vilanova
1 sibling, 0 replies; 48+ messages in thread
From: Eric Blake @ 2016-09-19 16:02 UTC (permalink / raw)
To: Daniel P. Berrange, qemu-devel; +Cc: Lluís Vilanova, Stefan Hajnoczi
[-- Attachment #1: Type: text/plain, Size: 845 bytes --]
On 09/19/2016 09:49 AM, Daniel P. Berrange wrote:
> Currently the generated-events.[ch] files contain the
> event dstates, constants and TraceEvent structs, while the
> generated-tracers.[ch] files contain the actual trace
> probe logic. With the removal of usage of the event enums
> from the API there is no longer any compelling reason for
> the separation between these files. The generated-events.h
> content is only ever be needed from the generated-tracers.[ch]
s/be //
> files.
>
> The enums/constants/structs from generated-events.[ch] are
> thus moved into the generated-tracers.[ch], so that there
> is one less file to be generated.
>
> Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
> ---
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 604 bytes --]
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [Qemu-devel] [PATCH v3 01/18] trace: add trace event iterator APIs
2016-09-19 14:48 ` [Qemu-devel] [PATCH v3 01/18] trace: add trace event iterator APIs Daniel P. Berrange
@ 2016-09-19 16:39 ` Lluís Vilanova
0 siblings, 0 replies; 48+ messages in thread
From: Lluís Vilanova @ 2016-09-19 16:39 UTC (permalink / raw)
To: Daniel P. Berrange; +Cc: qemu-devel, Stefan Hajnoczi
Daniel P Berrange writes:
> Currently methods which want to iterate over trace events,
> do so using the trace_event_count() and trace_event_id()
> methods. This leaks the concept of a single ID enum to
> the callers. There is an alternative trace_event_pattern()
> method which can be used in an iteration context, but its
> design is stateless, so is not easy to expand it in the
> future.
> This defines a formal iterator API will provide an future
> proof way of iterating over events.
an -> a
future proof -> future-proof
> The iterator is also able to apply a pattern match filter
> to events, further removing the need for the pattern
> Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
As for patch contents:
Reviewed-by: Lluís Vilanova <vilanova@ac.upc.edu>
> ---
> trace/control.c | 21 +++++++++++++++++++++
> trace/control.h | 27 +++++++++++++++++++++++++++
> 2 files changed, 48 insertions(+)
> diff --git a/trace/control.c b/trace/control.c
> index 05d85ac..1a96049 100644
> --- a/trace/control.c
> +++ b/trace/control.c
> @@ -125,6 +125,27 @@ TraceEvent *trace_event_pattern(const char *pat, TraceEvent *ev)
> return NULL;
> }
> +void trace_event_iter_init(TraceEventIter *iter, const char *pattern)
> +{
> + iter->event = 0;
> + iter->pattern = pattern;
> +}
> +
> +TraceEvent *trace_event_iter_next(TraceEventIter *iter)
> +{
> + while (iter->event < TRACE_EVENT_COUNT) {
> + TraceEvent *ev = &(trace_events[iter->event]);
> + iter->event++;
> + if (!iter->pattern ||
> + pattern_glob(iter->pattern,
> + trace_event_get_name(ev))) {
> + return ev;
> + }
> + }
> +
> + return NULL;
> +}
> +
> void trace_list_events(void)
> {
> int i;
> diff --git a/trace/control.h b/trace/control.h
> index 27a16fc..c71b405 100644
> --- a/trace/control.h
> +++ b/trace/control.h
> @@ -13,6 +13,10 @@
> #include "qemu-common.h"
> #include "trace/generated-events.h"
> +typedef struct TraceEventIter {
> + size_t event;
> + const char *pattern;
> +} TraceEventIter;
> /**
> * TraceEventID:
> @@ -25,6 +29,29 @@
> */
> enum TraceEventID;
> +
> +/**
> + * trace_event_iter_init:
> + * @iter: the event iterator struct
> + * @pattern: optional pattern to filter events on name
> + *
> + * Initialize the event iterator struct @iter,
> + * optionally using @pattern to filter out events
> + * with non-matching names.
> + */
> +void trace_event_iter_init(TraceEventIter *iter, const char *pattern);
> +
> +/**
> + * trace_event_iter_next:
> + * @iter: the event iterator struct
> + *
> + * Get the next event, if any. When this returns NULL,
> + * the iterator should no longer be used.
> + *
> + * Returns: the next event, or NULL if no more events exist
> + */
> +TraceEvent *trace_event_iter_next(TraceEventIter *iter);
> +
> /**
> * trace_event_id:
> * @id: Event identifier.
> --
> 2.7.4
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [Qemu-devel] [PATCH v3 02/18] trace: convert code to use event iterators
2016-09-19 14:48 ` [Qemu-devel] [PATCH v3 02/18] trace: convert code to use event iterators Daniel P. Berrange
@ 2016-09-19 16:59 ` Lluís Vilanova
2016-09-20 13:13 ` Daniel P. Berrange
0 siblings, 1 reply; 48+ messages in thread
From: Lluís Vilanova @ 2016-09-19 16:59 UTC (permalink / raw)
To: Daniel P. Berrange; +Cc: qemu-devel, Stefan Hajnoczi
Daniel P Berrange writes:
> This converts the HMP/QMP monitor API implementations
> and some internal trace control methods to use the new
> trace event iterator APIs.
> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
> Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
> ---
> monitor.c | 26 ++++++++--------
> trace/control.c | 92 +++++++++++++++++++++++++++++++++------------------------
> trace/qmp.c | 16 ++++++----
> 3 files changed, 78 insertions(+), 56 deletions(-)
> diff --git a/monitor.c b/monitor.c
> index 5c00373..ae70157 100644
> --- a/monitor.c
> +++ b/monitor.c
> @@ -3335,13 +3335,14 @@ void info_trace_events_completion(ReadLineState *rs, int nb_args, const char *st
> len = strlen(str);
> readline_set_completion_index(rs, len);
> if (nb_args == 2) {
> - TraceEventID id;
> - for (id = 0; id < trace_event_count(); id++) {
> - const char *event_name = trace_event_get_name(trace_event_id(id));
> - if (!strncmp(str, event_name, len)) {
> - readline_add_completion(rs, event_name);
> - }
> + TraceEventIter iter;
> + TraceEvent *ev;
> + char *pattern = g_strdup_printf("%s*", str);
> + trace_event_iter_init(&iter, pattern);
> + while ((ev = trace_event_iter_next(&iter)) != NULL) {
> + readline_add_completion(rs, trace_event_get_name(ev));
> }
> + g_free(pattern);
> }
> }
> @@ -3352,13 +3353,14 @@ void trace_event_completion(ReadLineState *rs, int nb_args, const char *str)
> len = strlen(str);
> readline_set_completion_index(rs, len);
> if (nb_args == 2) {
> - TraceEventID id;
> - for (id = 0; id < trace_event_count(); id++) {
> - const char *event_name = trace_event_get_name(trace_event_id(id));
> - if (!strncmp(str, event_name, len)) {
> - readline_add_completion(rs, event_name);
> - }
> + TraceEventIter iter;
> + TraceEvent *ev;
> + char *pattern = g_strdup_printf("%s*", str);
> + trace_event_iter_init(&iter, pattern);
> + while ((ev = trace_event_iter_next(&iter)) != NULL) {
> + readline_add_completion(rs, trace_event_get_name(ev));
> }
> + g_free(pattern);
> } else if (nb_args == 3) {
> add_completion_option(rs, str, "on");
> add_completion_option(rs, str, "off");
> diff --git a/trace/control.c b/trace/control.c
> index 1a96049..b471146 100644
> --- a/trace/control.c
> +++ b/trace/control.c
> @@ -60,9 +60,10 @@ TraceEvent *trace_event_name(const char *name)
> {
> assert(name != NULL);
> - TraceEventID i;
> - for (i = 0; i < trace_event_count(); i++) {
> - TraceEvent *ev = trace_event_id(i);
> + TraceEventIter iter;
> + TraceEvent *ev;
> + trace_event_iter_init(&iter, NULL);
> + while ((ev = trace_event_iter_next(&iter)) != NULL) {
> if (strcmp(trace_event_get_name(ev), name) == 0) {
> return ev;
> }
> @@ -105,21 +106,18 @@ TraceEvent *trace_event_pattern(const char *pat, TraceEvent *ev)
> {
> assert(pat != NULL);
> - TraceEventID i;
> -
> - if (ev == NULL) {
> - i = -1;
> - } else {
> - i = trace_event_get_id(ev);
> - }
> - i++;
> -
> - while (i < trace_event_count()) {
> - TraceEvent *res = trace_event_id(i);
> - if (pattern_glob(pat, trace_event_get_name(res))) {
> - return res;
> + bool matched = ev ? false : true;
> + TraceEventIter iter;
> + TraceEvent *thisev;
> + trace_event_iter_init(&iter, pat);
> + while ((thisev = trace_event_iter_next(&iter)) != NULL) {
> + if (matched) {
> + return thisev;
> + } else {
> + if (ev == thisev) {
> + matched = true;
> + }
> }
> - i++;
> }
> return NULL;
> @@ -148,10 +146,11 @@ TraceEvent *trace_event_iter_next(TraceEventIter *iter)
> void trace_list_events(void)
> {
> - int i;
> - for (i = 0; i < trace_event_count(); i++) {
> - TraceEvent *res = trace_event_id(i);
> - fprintf(stderr, "%s\n", trace_event_get_name(res));
> + TraceEventIter iter;
> + TraceEvent *ev;
> + trace_event_iter_init(&iter, NULL);
> + while ((ev = trace_event_iter_next(&iter)) != NULL) {
> + fprintf(stderr, "%s\n", trace_event_get_name(ev));
> }
> }
> @@ -159,25 +158,40 @@ static void do_trace_enable_events(const char *line_buf)
> {
> const bool enable = ('-' != line_buf[0]);
> const char *line_ptr = enable ? line_buf : line_buf + 1;
> -
> - if (trace_event_is_pattern(line_ptr)) {
> - TraceEvent *ev = NULL;
> - while ((ev = trace_event_pattern(line_ptr, ev)) != NULL) {
> + TraceEventIter iter;
> + TraceEvent *ev;
> + bool is_pattern = trace_event_is_pattern(line_ptr);
> +
> + trace_event_iter_init(&iter, is_pattern ? line_ptr : NULL);
> + while ((ev = trace_event_iter_next(&iter)) != NULL) {
> + bool match = false;
> + if (is_pattern) {
> if (trace_event_get_state_static(ev)) {
> - trace_event_set_state_dynamic_init(ev, enable);
> + match = true;
> }
> - }
> - } else {
> - TraceEvent *ev = trace_event_name(line_ptr);
> - if (ev == NULL) {
> - error_report("WARNING: trace event '%s' does not exist",
> - line_ptr);
> - } else if (!trace_event_get_state_static(ev)) {
> - error_report("WARNING: trace event '%s' is not traceable",
> - line_ptr);
> } else {
> - trace_event_set_state_dynamic_init(ev, enable);
> + if (g_str_equal(trace_event_get_name(ev),
> + line_ptr)) {
Why do some places use strcmp() and others g_str_equal() (the former are only on
previously existing lines).
If you maintain calls to trace_event_name() instead of iterating on both paths,
the function used to compare names would be "unique". And would also make the
warning logic at the end easier to follow (even if you call
_set_state_dynamic_init() from two places instead of one).
> + if (!trace_event_get_state_static(ev)) {
> + error_report("WARNING: trace event '%s' is not traceable",
> + line_ptr);
> + return;
> + }
> + match = true;
> + }
> }
> + if (match) {
> + /* start tracing */
> + trace_event_set_state_dynamic(ev, enable);
> + if (!is_pattern) {
> + return;
> + }
> + }
> + }
> +
> + if (!is_pattern) {
> + error_report("WARNING: trace event '%s' does not exist",
> + line_ptr);
> }
> }
> @@ -293,8 +307,10 @@ char *trace_opt_parse(const char *optarg)
> void trace_init_vcpu_events(void)
> {
> - TraceEvent *ev = NULL;
> - while ((ev = trace_event_pattern("*", ev)) != NULL) {
> + TraceEventIter iter;
> + TraceEvent *ev;
> + trace_event_iter_init(&iter, NULL);
> + while ((ev = trace_event_iter_next(&iter)) != NULL) {
> if (trace_event_is_vcpu(ev) &&
> trace_event_get_state_static(ev) &&
> trace_event_get_state_dynamic(ev)) {
> diff --git a/trace/qmp.c b/trace/qmp.c
> index 11d2564..88a907b 100644
> --- a/trace/qmp.c
> +++ b/trace/qmp.c
> @@ -52,8 +52,10 @@ static bool check_events(bool has_vcpu, bool ignore_unavailable, bool is_pattern
> return true;
> } else {
> /* error for unavailable events */
> - TraceEvent *ev = NULL;
> - while ((ev = trace_event_pattern(name, ev)) != NULL) {
> + TraceEventIter iter;
> + TraceEvent *ev;
> + trace_event_iter_init(&iter, name);
> + while ((ev = trace_event_iter_next(&iter)) != NULL) {
> if (!ignore_unavailable && !trace_event_get_state_static(ev)) {
> error_setg(errp, "event \"%s\" is disabled", trace_event_get_name(ev));
> return false;
> @@ -69,6 +71,7 @@ TraceEventInfoList *qmp_trace_event_get_state(const char *name,
> {
> Error *err = NULL;
> TraceEventInfoList *events = NULL;
> + TraceEventIter iter;
> TraceEvent *ev;
> bool is_pattern = trace_event_is_pattern(name);
> CPUState *cpu;
> @@ -86,8 +89,8 @@ TraceEventInfoList *qmp_trace_event_get_state(const char *name,
> }
> /* Get states (all errors checked above) */
> - ev = NULL;
> - while ((ev = trace_event_pattern(name, ev)) != NULL) {
> + trace_event_iter_init(&iter, is_pattern ? name : NULL);
> + while ((ev = trace_event_iter_next(&iter)) != NULL) {
> TraceEventInfoList *elem;
> bool is_vcpu = trace_event_is_vcpu(ev);
> if (has_vcpu && !is_vcpu) {
> @@ -132,6 +135,7 @@ void qmp_trace_event_set_state(const char *name, bool enable,
> Error **errp)
> {
> Error *err = NULL;
> + TraceEventIter iter;
> TraceEvent *ev;
> bool is_pattern = trace_event_is_pattern(name);
> CPUState *cpu;
> @@ -150,8 +154,8 @@ void qmp_trace_event_set_state(const char *name, bool enable,
> }
> /* Apply changes (all errors checked above) */
> - ev = NULL;
> - while ((ev = trace_event_pattern(name, ev)) != NULL) {
> + trace_event_iter_init(&iter, name);
> + while ((ev = trace_event_iter_next(&iter)) != NULL) {
> if (!trace_event_get_state_static(ev) ||
> (has_vcpu && !trace_event_is_vcpu(ev))) {
> continue;
> --
> 2.7.4
Thanks,
Lluis
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [Qemu-devel] [PATCH v3 03/18] trace: remove some now unused functions
2016-09-19 14:48 ` [Qemu-devel] [PATCH v3 03/18] trace: remove some now unused functions Daniel P. Berrange
@ 2016-09-19 17:00 ` Lluís Vilanova
2016-09-19 17:24 ` Daniel P. Berrange
0 siblings, 1 reply; 48+ messages in thread
From: Lluís Vilanova @ 2016-09-19 17:00 UTC (permalink / raw)
To: Daniel P. Berrange; +Cc: qemu-devel, Stefan Hajnoczi
Daniel P Berrange writes:
> The trace_event_count, trace_event_id and
> trace_event_pattern methods are no longer required
> now that everything is using the iterator APIs
> The trace_event_set_state and trace_event_set_vcpu_state
> macros were also unused.
Wouldn't it make more sense to fold the removal of trace_event_pattern() into
the previous patch?
Thanks,
Lluis
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [Qemu-devel] [PATCH v3 04/18] trace: remove global 'uint16 dstate[]' array
2016-09-19 14:48 ` [Qemu-devel] [PATCH v3 04/18] trace: remove global 'uint16 dstate[]' array Daniel P. Berrange
2016-09-19 15:55 ` Eric Blake
@ 2016-09-19 17:05 ` Lluís Vilanova
1 sibling, 0 replies; 48+ messages in thread
From: Lluís Vilanova @ 2016-09-19 17:05 UTC (permalink / raw)
To: Daniel P. Berrange; +Cc: qemu-devel, Stefan Hajnoczi
Daniel P Berrange writes:
> Instead of having a global dstate array, declare a single
> 'uint16 TRACE_${EVENT_NAME}_DSTATE' variable for each
> trace event. Record a pointer to this variable in the
> TraceEvent struct too.
> By turning trace_event_get_state_dynamic_by_id into a
> macro, this still hits the fast path, and cache affinity
> is ensured by declaring all the uint16 vars adjacent to
> each other.
> Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Besides Eric's comments:
Reviewed-by: Lluís Vilanova <vilanova@ac.upc.edu>
> ---
> scripts/tracetool/__init__.py | 3 ++-
> scripts/tracetool/format/events_c.py | 9 +++++++--
> scripts/tracetool/format/events_h.py | 3 +++
> stubs/trace-control.c | 9 ++++-----
> trace/control-internal.h | 14 ++++----------
> trace/control-target.c | 20 ++++++++------------
> trace/control.c | 11 ++---------
> trace/event-internal.h | 6 ++++++
> 8 files changed, 36 insertions(+), 39 deletions(-)
> diff --git a/scripts/tracetool/__init__.py b/scripts/tracetool/__init__.py
> index be24039..5191df9 100644
> --- a/scripts/tracetool/__init__.py
> +++ b/scripts/tracetool/__init__.py
> @@ -265,11 +265,12 @@ class Event(object):
> QEMU_TRACE = "trace_%(name)s"
> QEMU_TRACE_TCG = QEMU_TRACE + "_tcg"
> + QEMU_DSTATE = "___TRACE_%(NAME)s_DSTATE"
> def api(self, fmt=None):
> if fmt is None:
> fmt = Event.QEMU_TRACE
> - return fmt % {"name": self.name}
> + return fmt % {"name": self.name, "NAME": self.name.upper()}
> def transform(self, *trans):
> """Return a new Event with transformed Arguments."""
> diff --git a/scripts/tracetool/format/events_c.py b/scripts/tracetool/format/events_c.py
> index 4012063..ef873fa 100644
> --- a/scripts/tracetool/format/events_c.py
> +++ b/scripts/tracetool/format/events_c.py
> @@ -25,6 +25,9 @@ def generate(events, backend):
> '#include "trace/control.h"',
> '')
> + for e in events:
> + out('uint16_t %s;' % e.api(e.QEMU_DSTATE))
> +
> out('TraceEvent trace_events[TRACE_EVENT_COUNT] = {')
> for e in events:
> @@ -34,11 +37,13 @@ def generate(events, backend):
> vcpu_id = "TRACE_VCPU_EVENT_COUNT"
> out(' { .id = %(id)s, .vcpu_id = %(vcpu_id)s,'
> ' .name = \"%(name)s\",'
> - ' .sstate = %(sstate)s },',
> + ' .sstate = %(sstate)s,',
> + ' .dstate = &%(dstate)s, }, ',
> id = "TRACE_" + e.name.upper(),
> vcpu_id = vcpu_id,
> name = e.name,
> - sstate = "TRACE_%s_ENABLED" % e.name.upper())
> + sstate = "TRACE_%s_ENABLED" % e.name.upper(),
> + dstate = e.api(e.QEMU_DSTATE))
> out('};',
> '')
> diff --git a/scripts/tracetool/format/events_h.py b/scripts/tracetool/format/events_h.py
> index a9da60b..03417de 100644
> --- a/scripts/tracetool/format/events_h.py
> +++ b/scripts/tracetool/format/events_h.py
> @@ -32,6 +32,9 @@ def generate(events, backend):
> out(' TRACE_EVENT_COUNT',
> '} TraceEventID;')
> + for e in events:
> + out('extern uint16_t %s;' % e.api(e.QEMU_DSTATE))
> +
> # per-vCPU event identifiers
> out('typedef enum {')
> diff --git a/stubs/trace-control.c b/stubs/trace-control.c
> index 2dfcd9f..dd68f25 100644
> --- a/stubs/trace-control.c
> +++ b/stubs/trace-control.c
> @@ -18,22 +18,21 @@ void trace_event_set_state_dynamic_init(TraceEvent *ev, bool state)
> void trace_event_set_state_dynamic(TraceEvent *ev, bool state)
> {
> - TraceEventID id;
> bool state_pre;
> assert(trace_event_get_state_static(ev));
> - id = trace_event_get_id(ev);
> +
> /*
> * We ignore the "vcpu" property here, since there's no target code. Then
> * dstate can only be 1 or 0.
> */
> - state_pre = trace_events_dstate[id];
> + state_pre = *(ev->dstate);
> if (state_pre != state) {
> if (state) {
> trace_events_enabled_count++;
> - trace_events_dstate[id] = 1;
> + *(ev->dstate) = 1;
> } else {
> trace_events_enabled_count--;
> - trace_events_dstate[id] = 0;
> + *(ev->dstate) = 0;
> }
> }
> }
> diff --git a/trace/control-internal.h b/trace/control-internal.h
> index 7f31e39..828c1fc 100644
> --- a/trace/control-internal.h
> +++ b/trace/control-internal.h
> @@ -16,7 +16,6 @@
> extern TraceEvent trace_events[];
> -extern uint16_t trace_events_dstate[];
> extern int trace_events_enabled_count;
> @@ -54,18 +53,13 @@ static inline bool trace_event_get_state_static(TraceEvent *ev)
> return ev->sstate;
> }
> -static inline bool trace_event_get_state_dynamic_by_id(TraceEventID id)
> -{
> - /* it's on fast path, avoid consistency checks (asserts) */
> - return unlikely(trace_events_enabled_count) && trace_events_dstate[id];
> -}
> +/* it's on fast path, avoid consistency checks (asserts) */
> +#define trace_event_get_state_dynamic_by_id(id) \
> + (unlikely(trace_events_enabled_count) && ___ ## id ## _DSTATE)
> static inline bool trace_event_get_state_dynamic(TraceEvent *ev)
> {
> - TraceEventID id;
> - assert(trace_event_get_state_static(ev));
> - id = trace_event_get_id(ev);
> - return trace_event_get_state_dynamic_by_id(id);
> + return unlikely(trace_events_enabled_count) && *ev->dstate;
> }
> static inline bool trace_event_get_vcpu_state_dynamic_by_vcpu_id(CPUState *vcpu,
> diff --git a/trace/control-target.c b/trace/control-target.c
> index 72081e2..c69dda9 100644
> --- a/trace/control-target.c
> +++ b/trace/control-target.c
> @@ -15,21 +15,20 @@
> void trace_event_set_state_dynamic_init(TraceEvent *ev, bool state)
> {
> - TraceEventID id = trace_event_get_id(ev);
> bool state_pre;
> assert(trace_event_get_state_static(ev));
> /*
> * We ignore the "vcpu" property here, since no vCPUs have been created
> * yet. Then dstate can only be 1 or 0.
> */
> - state_pre = trace_events_dstate[id];
> + state_pre = *ev->dstate;
> if (state_pre != state) {
> if (state) {
> trace_events_enabled_count++;
> - trace_events_dstate[id] = 1;
> + *ev->dstate = 1;
> } else {
> trace_events_enabled_count--;
> - trace_events_dstate[id] = 0;
> + *ev->dstate = 0;
> }
> }
> }
> @@ -44,15 +43,14 @@ void trace_event_set_state_dynamic(TraceEvent *ev, bool state)
> }
> } else {
> /* Without the "vcpu" property, dstate can only be 1 or 0 */
> - TraceEventID id = trace_event_get_id(ev);
> - bool state_pre = trace_events_dstate[id];
> + bool state_pre = *ev->dstate;
> if (state_pre != state) {
> if (state) {
> trace_events_enabled_count++;
> - trace_events_dstate[id] = 1;
> + *ev->dstate = 1;
> } else {
> trace_events_enabled_count--;
> - trace_events_dstate[id] = 0;
> + *ev->dstate = 0;
> }
> }
> }
> @@ -61,23 +59,21 @@ void trace_event_set_state_dynamic(TraceEvent *ev, bool state)
> void trace_event_set_vcpu_state_dynamic(CPUState *vcpu,
> TraceEvent *ev, bool state)
> {
> - TraceEventID id;
> TraceEventVCPUID vcpu_id;
> bool state_pre;
> assert(trace_event_get_state_static(ev));
> assert(trace_event_is_vcpu(ev));
> - id = trace_event_get_id(ev);
> vcpu_id = trace_event_get_vcpu_id(ev);
> state_pre = test_bit(vcpu_id, vcpu->trace_dstate);
> if (state_pre != state) {
> if (state) {
> trace_events_enabled_count++;
> set_bit(vcpu_id, vcpu->trace_dstate);
> - trace_events_dstate[id]++;
> + (*ev->dstate)++;
> } else {
> trace_events_enabled_count--;
> clear_bit(vcpu_id, vcpu->trace_dstate);
> - trace_events_dstate[id]--;
> + (*ev->dstate)--;
> }
> }
> }
> diff --git a/trace/control.c b/trace/control.c
> index 303b3f3..c681fa0 100644
> --- a/trace/control.c
> +++ b/trace/control.c
> @@ -28,12 +28,6 @@
> #include "monitor/monitor.h"
> int trace_events_enabled_count;
> -/*
> - * Interpretation depends on wether the event has the 'vcpu' property:
> - * - false: Boolean value indicating whether the event is active.
> - * - true : Integral counting the number of vCPUs that have this event enabled.
> - */
> -uint16_t trace_events_dstate[TRACE_EVENT_COUNT];
> QemuOptsList qemu_trace_opts = {
> .name = "trace",
> @@ -294,11 +288,10 @@ void trace_init_vcpu_events(void)
> if (trace_event_is_vcpu(ev) &&
> trace_event_get_state_static(ev) &&
> trace_event_get_state_dynamic(ev)) {
> - TraceEventID id = trace_event_get_id(ev);
> /* check preconditions */
> - assert(trace_events_dstate[id] == 1);
> + assert(*ev->dstate == 1);
> /* disable early-init state ... */
> - trace_events_dstate[id] = 0;
> + *ev->dstate = 0;
> trace_events_enabled_count--;
> /* ... and properly re-enable */
> trace_event_set_state_dynamic(ev, true);
> diff --git a/trace/event-internal.h b/trace/event-internal.h
> index 074faf6..3b9ceb5 100644
> --- a/trace/event-internal.h
> +++ b/trace/event-internal.h
> @@ -19,6 +19,11 @@
> * @vcpu_id: Unique per-vCPU event identifier.
> * @name: Event name.
> * @sstate: Static tracing state.
> + * @dstate: Dynamic tracing state
> + *
> + * Interpretation of @dstate depends on wether the event has the 'vcpu' property:
> + * - false: Boolean value indicating whether the event is active.
> + * - true : Integral counting the number of vCPUs that have this event enabled.
> *
> * Opaque generic description of a tracing event.
> */
> @@ -27,6 +32,7 @@ typedef struct TraceEvent {
> TraceEventVCPUID vcpu_id;
> const char * name;
> const bool sstate;
> + uint16_t *dstate;
> } TraceEvent;
> void trace_event_set_state_dynamic_init(TraceEvent *ev, bool state);
> --
> 2.7.4
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [Qemu-devel] [PATCH v3 05/18] trace: remove duplicate control.h includes in generated-tracers.h
2016-09-19 14:48 ` [Qemu-devel] [PATCH v3 05/18] trace: remove duplicate control.h includes in generated-tracers.h Daniel P. Berrange
@ 2016-09-19 17:06 ` Lluís Vilanova
0 siblings, 0 replies; 48+ messages in thread
From: Lluís Vilanova @ 2016-09-19 17:06 UTC (permalink / raw)
To: Daniel P. Berrange; +Cc: qemu-devel, Stefan Hajnoczi
Daniel P Berrange writes:
> The format/h.py file adds an include for control.h to
> generated-tracers.h. ftrace, log and syslog, then
> add more duplicate includes for control.h.
> Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Reviewed-by: Lluís Vilanova <vilanova@ac.upc.edu>
> ---
> scripts/tracetool/backend/ftrace.py | 1 -
> scripts/tracetool/backend/log.py | 3 +--
> scripts/tracetool/backend/syslog.py | 1 -
> 3 files changed, 1 insertion(+), 4 deletions(-)
> diff --git a/scripts/tracetool/backend/ftrace.py b/scripts/tracetool/backend/ftrace.py
> index 80dcf30..4b83b44 100644
> --- a/scripts/tracetool/backend/ftrace.py
> +++ b/scripts/tracetool/backend/ftrace.py
> @@ -21,7 +21,6 @@ PUBLIC = True
> def generate_h_begin(events):
> out('#include "trace/ftrace.h"',
> - '#include "trace/control.h"',
> '')
> diff --git a/scripts/tracetool/backend/log.py b/scripts/tracetool/backend/log.py
> index b3ff064..426bb6e 100644
> --- a/scripts/tracetool/backend/log.py
> +++ b/scripts/tracetool/backend/log.py
> @@ -20,8 +20,7 @@ PUBLIC = True
> def generate_h_begin(events):
> - out('#include "trace/control.h"',
> - '#include "qemu/log.h"',
> + out('#include "qemu/log.h"',
> '')
> diff --git a/scripts/tracetool/backend/syslog.py b/scripts/tracetool/backend/syslog.py
> index 89019bc..5f693bd 100644
> --- a/scripts/tracetool/backend/syslog.py
> +++ b/scripts/tracetool/backend/syslog.py
> @@ -21,7 +21,6 @@ PUBLIC = True
> def generate_h_begin(events):
> out('#include <syslog.h>',
> - '#include "trace/control.h"',
> '')
> --
> 2.7.4
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [Qemu-devel] [PATCH v3 06/18] trace: break circular dependancy in event-internal.h
2016-09-19 14:48 ` [Qemu-devel] [PATCH v3 06/18] trace: break circular dependancy in event-internal.h Daniel P. Berrange
@ 2016-09-19 17:08 ` Lluís Vilanova
2016-09-20 13:24 ` Daniel P. Berrange
0 siblings, 1 reply; 48+ messages in thread
From: Lluís Vilanova @ 2016-09-19 17:08 UTC (permalink / raw)
To: Daniel P. Berrange; +Cc: qemu-devel, Stefan Hajnoczi
Typo in subject: dependancy -> dependency
Daniel P Berrange writes:
> Currently event-internal.h includes generated-events.h,
> while generated-events.h includes event-internal.h
> causing a circular dependency.
> event-internal.h requires that the content of
> generated-events.h comes first, so that it can see
> the typedefs for TraceEventID and TraceEventVCPUID.
> Switching the TraceEvent struct to use uint32_t
> for the two ID fields, removes the dependency on
> the typedef, allowing events-internal.h to be a
> self-contained header. This will then let the patch
> following this move event-internal.h to the top of
> generated-events.h, so we can expose TraceEvent
> struct variables in generated-events.h
> Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
> ---
> trace/event-internal.h | 7 ++-----
> 1 file changed, 2 insertions(+), 5 deletions(-)
> diff --git a/trace/event-internal.h b/trace/event-internal.h
> index 3b9ceb5..36906e2 100644
> --- a/trace/event-internal.h
> +++ b/trace/event-internal.h
> @@ -10,9 +10,6 @@
> #ifndef TRACE__EVENT_INTERNAL_H
> #define TRACE__EVENT_INTERNAL_H
> -#include "trace/generated-events.h"
> -
> -
> /**
> * TraceEvent:
> * @id: Unique event identifier.
> @@ -28,8 +25,8 @@
> * Opaque generic description of a tracing event.
> */
> typedef struct TraceEvent {
> - TraceEventID id;
> - TraceEventVCPUID vcpu_id;
> + uint32_t id;
> + uint32_t vcpu_id;
Shouldn't these be 'size_t' for consistency with your iterator patch?
> const char * name;
> const bool sstate;
> uint16_t *dstate;
> --
> 2.7.4
Cheers,
Lluis
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [Qemu-devel] [PATCH v3 00/18] Refactor trace to allow modular build
2016-09-19 14:48 [Qemu-devel] [PATCH v3 00/18] Refactor trace to allow modular build Daniel P. Berrange
` (18 preceding siblings ...)
2016-09-19 15:54 ` [Qemu-devel] [PATCH v3 00/18] Refactor trace to allow modular build no-reply
@ 2016-09-19 17:13 ` no-reply
19 siblings, 0 replies; 48+ messages in thread
From: no-reply @ 2016-09-19 17:13 UTC (permalink / raw)
To: berrange; +Cc: famz, qemu-devel, vilanova, stefanha
Hi,
Your series failed automatic build test. Please find the testing commands and
their output below. If you have docker installed, you can probably reproduce it
locally.
Type: series
Subject: [Qemu-devel] [PATCH v3 00/18] Refactor trace to allow modular build
Message-id: 1474296549-29171-1-git-send-email-berrange@redhat.com
=== TEST SCRIPT BEGIN ===
#!/bin/bash
set -e
git submodule update --init dtc
make J=8 docker-test-quick@centos6
make J=8 docker-test-mingw@fedora
=== TEST SCRIPT END ===
Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
Switched to a new branch 'test'
439b7d5 trace: introduce a formal group name for trace events
97b7a5f trace: pass trace-events to tracetool as a positional param
46f2527 trace: push reading of events up a level to tracetool main
3f822f1 trace: rename _read_events to read_events
20a8ba2 trace: get rid of generated-events.h/generated-events.c
f6a861d trace: dynamically allocate event IDs at runtime
04e85e1 trace: dynamically allocate trace_dstate in CPUState
5ed1755 trace: provide mechanism for registering trace events
3472cce trace: don't abort qemu if ftrace can't be initialized
e1d4a86 trace: emit name <-> ID mapping in simpletrace header
2270adf trace: remove the TraceEventID and TraceEventVCPUID enums
604483a trace: give each trace event a named TraceEvent struct
731385d trace: break circular dependancy in event-internal.h
34a7e6d trace: remove duplicate control.h includes in generated-tracers.h
6af9de1 trace: remove global 'uint16 dstate[]' array
5c47d07 trace: remove some now unused functions
a222901 trace: convert code to use event iterators
6d86092 trace: add trace event iterator APIs
=== OUTPUT BEGIN ===
Submodule 'dtc' (git://git.qemu-project.org/dtc.git) registered for path 'dtc'
Cloning into 'dtc'...
Submodule path 'dtc': checked out '65cc4d2748a2c2e6f27f1cf39e07a5dbabd80ebf'
BUILD centos6
ARCHIVE qemu.tgz
ARCHIVE dtc.tgz
COPY RUNNER
RUN test-quick in centos6
No C++ compiler available; disabling C++ specific optional code
Install prefix /tmp/qemu-test/src/tests/docker/install
BIOS directory /tmp/qemu-test/src/tests/docker/install/share/qemu
binary directory /tmp/qemu-test/src/tests/docker/install/bin
library directory /tmp/qemu-test/src/tests/docker/install/lib
module directory /tmp/qemu-test/src/tests/docker/install/lib/qemu
libexec directory /tmp/qemu-test/src/tests/docker/install/libexec
include directory /tmp/qemu-test/src/tests/docker/install/include
config directory /tmp/qemu-test/src/tests/docker/install/etc
local state directory /tmp/qemu-test/src/tests/docker/install/var
Manual directory /tmp/qemu-test/src/tests/docker/install/share/man
ELF interp prefix /usr/gnemul/qemu-%M
Source path /tmp/qemu-test/src
C compiler cc
Host C compiler cc
C++ compiler
Objective-C compiler cc
ARFLAGS rv
CFLAGS -O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -pthread -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -g
QEMU_CFLAGS -I/usr/include/pixman-1 -fPIE -DPIE -m64 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Wstrict-prototypes -Wredundant-decls -Wall -Wundef -Wwrite-strings -Wmissing-prototypes -fno-strict-aliasing -fno-common -fwrapv -Wendif-labels -Wmissing-include-dirs -Wempty-body -Wnested-externs -Wformat-security -Wformat-y2k -Winit-self -Wignored-qualifiers -Wold-style-declaration -Wold-style-definition -Wtype-limits -fstack-protector-all
LDFLAGS -Wl,--warn-common -Wl,-z,relro -Wl,-z,now -pie -m64 -g
make make
install install
python python -B
smbd /usr/sbin/smbd
module support no
host CPU x86_64
host big endian no
target list x86_64-softmmu aarch64-softmmu
tcg debug enabled no
gprof enabled no
sparse enabled no
strip binaries yes
profiler no
static build no
pixman system
SDL support yes (1.2.14)
GTK support no
GTK GL support no
VTE support no
TLS priority NORMAL
GNUTLS support no
GNUTLS rnd no
libgcrypt no
libgcrypt kdf no
nettle no
nettle kdf no
libtasn1 no
curses support no
virgl support no
curl support no
mingw32 support no
Audio drivers oss
Block whitelist (rw)
Block whitelist (ro)
VirtFS support no
VNC support yes
VNC SASL support no
VNC JPEG support no
VNC PNG support no
xen support no
brlapi support no
bluez support no
Documentation no
PIE yes
vde support no
netmap support no
Linux AIO support no
ATTR/XATTR support yes
Install blobs yes
KVM support yes
RDMA support no
TCG interpreter no
fdt support yes
preadv support yes
fdatasync yes
madvise yes
posix_madvise yes
uuid support no
libcap-ng support no
vhost-net support yes
vhost-scsi support yes
vhost-vsock support yes
Trace backends log
spice support no
rbd support no
xfsctl support no
smartcard support no
libusb no
usb net redir no
OpenGL support no
OpenGL dmabufs no
libiscsi support no
libnfs support no
build guest agent yes
QGA VSS support no
QGA w32 disk info no
QGA MSI support no
seccomp support no
coroutine backend ucontext
coroutine pool yes
GlusterFS support no
Archipelago support no
gcov gcov
gcov enabled no
TPM support yes
libssh2 support no
TPM passthrough yes
QOM debugging yes
vhdx no
lzo support no
snappy support no
bzip2 support no
NUMA host support no
tcmalloc support no
jemalloc support no
avx2 optimization no
replication support yes
GEN x86_64-softmmu/config-devices.mak.tmp
GEN aarch64-softmmu/config-devices.mak.tmp
GEN config-host.h
GEN qemu-options.def
GEN qmp-commands.h
GEN qapi-types.h
GEN qapi-visit.h
GEN qapi-event.h
GEN x86_64-softmmu/config-devices.mak
GEN aarch64-softmmu/config-devices.mak
GEN qmp-introspect.h
GEN tests/test-qapi-types.h
GEN tests/test-qapi-visit.h
GEN tests/test-qmp-commands.h
GEN tests/test-qapi-event.h
GEN tests/test-qmp-introspect.h
GEN config-all-devices.mak
GEN trace/generated-tracers.h
GEN trace/generated-tcg-tracers.h
GEN trace/generated-helpers-wrappers.h
GEN trace/generated-helpers.h
=== OUTPUT END ===
Abort: command timeout (>3600 seconds)
---
Email generated automatically by Patchew [http://patchew.org/].
Please send your feedback to patchew-devel@freelists.org
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [Qemu-devel] [PATCH v3 07/18] trace: give each trace event a named TraceEvent struct
2016-09-19 14:48 ` [Qemu-devel] [PATCH v3 07/18] trace: give each trace event a named TraceEvent struct Daniel P. Berrange
@ 2016-09-19 17:17 ` Lluís Vilanova
0 siblings, 0 replies; 48+ messages in thread
From: Lluís Vilanova @ 2016-09-19 17:17 UTC (permalink / raw)
To: Daniel P. Berrange; +Cc: qemu-devel, Stefan Hajnoczi
Daniel P Berrange writes:
> Currently we only expose a TraceEvent array, which must
> be indexed via the TraceEventID enum constants. This
> changes the generator to expose a named TraceEvent
> instance for each event, with an _EV suffix.
> Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
> ---
> scripts/tracetool/format/events_c.py | 20 ++++++++++++++------
> scripts/tracetool/format/events_h.py | 10 +++++++---
> trace/control-internal.h | 2 +-
> trace/control.c | 2 +-
> 4 files changed, 23 insertions(+), 11 deletions(-)
> diff --git a/scripts/tracetool/format/events_c.py b/scripts/tracetool/format/events_c.py
> index ef873fa..5f67a7b 100644
> --- a/scripts/tracetool/format/events_c.py
> +++ b/scripts/tracetool/format/events_c.py
> @@ -28,22 +28,30 @@ def generate(events, backend):
> for e in events:
> out('uint16_t %s;' % e.api(e.QEMU_DSTATE))
> - out('TraceEvent trace_events[TRACE_EVENT_COUNT] = {')
> -
> for e in events:
> if "vcpu" in e.properties:
> vcpu_id = "TRACE_VCPU_" + e.name.upper()
> else:
> vcpu_id = "TRACE_VCPU_EVENT_COUNT"
> - out(' { .id = %(id)s, .vcpu_id = %(vcpu_id)s,'
> - ' .name = \"%(name)s\",'
> - ' .sstate = %(sstate)s,',
> - ' .dstate = &%(dstate)s, }, ',
> + out('TraceEvent %(event)s = {',
> + ' .id = %(id)s,',
> + ' .vcpu_id = %(vcpu_id)s,',
> + ' .name = \"%(name)s\",',
> + ' .sstate = %(sstate)s,',
> + ' .dstate = &%(dstate)s ',
> + '};',
> + event = "TRACE_" + e.name.upper() + "_EV",
Please use Event.api() here too (and on any references below):
QEMU_EVENT = "___TRACE_%(NAME)s_EVENT"
> id = "TRACE_" + e.name.upper(),
> vcpu_id = vcpu_id,
> name = e.name,
> sstate = "TRACE_%s_ENABLED" % e.name.upper(),
> dstate = e.api(e.QEMU_DSTATE))
> + out('TraceEvent *trace_events[TRACE_EVENT_COUNT] = {')
> +
> + for e in events:
> + out('&%(event)s,',
> + event = "TRACE_" + e.name.upper() + "_EV")
> +
> out('};',
> '')
> diff --git a/scripts/tracetool/format/events_h.py b/scripts/tracetool/format/events_h.py
> index 03417de..1478e4c 100644
> --- a/scripts/tracetool/format/events_h.py
> +++ b/scripts/tracetool/format/events_h.py
> @@ -21,7 +21,12 @@ def generate(events, backend):
> '',
> '#ifndef TRACE__GENERATED_EVENTS_H',
> '#define TRACE__GENERATED_EVENTS_H',
> - '')
> + '',
> + '#include "trace/event-internal.h"',
> + )
> +
> + for e in events:
> + out('extern TraceEvent TRACE_%s_EV;' % e.name.upper())
> # event identifiers
> out('typedef enum {')
> @@ -58,6 +63,5 @@ def generate(events, backend):
> enabled=enabled)
> out('#define TRACE_%s_ENABLED %d' % (e.name.upper(), enabled))
> - out('#include "trace/event-internal.h"',
> - '',
> + out('',
> '#endif /* TRACE__GENERATED_EVENTS_H */')
> diff --git a/trace/control-internal.h b/trace/control-internal.h
> index 828c1fc..52b6b72 100644
> --- a/trace/control-internal.h
> +++ b/trace/control-internal.h
> @@ -15,7 +15,7 @@
> #include "qom/cpu.h"
> -extern TraceEvent trace_events[];
> +extern TraceEvent *trace_events[];
> extern int trace_events_enabled_count;
> diff --git a/trace/control.c b/trace/control.c
> index c681fa0..71ad6ba 100644
> --- a/trace/control.c
> +++ b/trace/control.c
> @@ -106,7 +106,7 @@ void trace_event_iter_init(TraceEventIter *iter, const char *pattern)
> TraceEvent *trace_event_iter_next(TraceEventIter *iter)
> {
> while (iter->event < TRACE_EVENT_COUNT) {
> - TraceEvent *ev = &(trace_events[iter->event]);
> + TraceEvent *ev = trace_events[iter->event];
iter-> event++;
> if (!iter->pattern ||
> pattern_glob(iter->pattern,
> --
> 2.7.4
Cheers,
Lluis
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [Qemu-devel] [PATCH v3 03/18] trace: remove some now unused functions
2016-09-19 17:00 ` Lluís Vilanova
@ 2016-09-19 17:24 ` Daniel P. Berrange
0 siblings, 0 replies; 48+ messages in thread
From: Daniel P. Berrange @ 2016-09-19 17:24 UTC (permalink / raw)
To: qemu-devel, Stefan Hajnoczi
On Mon, Sep 19, 2016 at 07:00:26PM +0200, Lluís Vilanova wrote:
> Daniel P Berrange writes:
>
> > The trace_event_count, trace_event_id and
> > trace_event_pattern methods are no longer required
> > now that everything is using the iterator APIs
>
> > The trace_event_set_state and trace_event_set_vcpu_state
> > macros were also unused.
>
> Wouldn't it make more sense to fold the removal of trace_event_pattern() into
> the previous patch?
No - that would be mixing two changes in one commit. There are two
logically separate changes here - one is changing an internal
implementation detail, and one is altering the public API to remove
methods.
Regards,
Daniel
--
|: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org -o- http://virt-manager.org :|
|: http://autobuild.org -o- http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [Qemu-devel] [PATCH v3 08/18] trace: remove the TraceEventID and TraceEventVCPUID enums
2016-09-19 14:48 ` [Qemu-devel] [PATCH v3 08/18] trace: remove the TraceEventID and TraceEventVCPUID enums Daniel P. Berrange
@ 2016-09-19 17:48 ` Lluís Vilanova
2016-09-20 13:29 ` Daniel P. Berrange
0 siblings, 1 reply; 48+ messages in thread
From: Lluís Vilanova @ 2016-09-19 17:48 UTC (permalink / raw)
To: Daniel P. Berrange; +Cc: qemu-devel, Stefan Hajnoczi
Daniel P Berrange writes:
> The TraceEventID and TraceEventVCPUID enums constants are
> no longer actually used for anything critical.
> The TRACE_EVENT_COUNT limit is used to determine the size
> of the TraceEvents array, and can be removed if we just
> NULL terminate the array instead.
> The TRACE_EVENT_VCPU_COUNT limit is used as a magic value
It's TRACE_VCPU_EVENT_COUNT.
> for marking non-vCPU events, and also for declaring the
> size of the trace dstate mask in the CPUState struct.
> The former usage can be replaced by a dedicated constant
> TRACE_EVENT_VCPU_NONE, defined as (uint32_t)-1. For the
> latter usage, we can simply define a constant for the
> number of VCPUs, avoiding the need for the full enum.
> The only other usages of the enum values can be replaced
> by accesing the id/vcpu_id fields via the named TraceEvent
> structs.
> Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
> ---
> scripts/tracetool/backend/simple.py | 2 +-
> scripts/tracetool/format/events_c.py | 16 +++++++++++-----
> scripts/tracetool/format/events_h.py | 18 +++---------------
> scripts/tracetool/format/h.py | 3 +--
> trace/control-internal.h | 16 ++++++++--------
> trace/control-target.c | 2 +-
> trace/control.c | 2 +-
> trace/control.h | 30 +++++++-----------------------
> trace/event-internal.h | 6 ++++++
> trace/simple.c | 6 +++---
> trace/simple.h | 2 +-
> 11 files changed, 43 insertions(+), 60 deletions(-)
> diff --git a/scripts/tracetool/backend/simple.py b/scripts/tracetool/backend/simple.py
> index 1bccada..971bd97 100644
> --- a/scripts/tracetool/backend/simple.py
> +++ b/scripts/tracetool/backend/simple.py
> @@ -80,7 +80,7 @@ def generate_c(event):
> ' return;',
> ' }',
> '',
> - ' if (trace_record_start(&rec, %(event_id)s, %(size_str)s)) {',
> + ' if (trace_record_start(&rec, %(event_id)s_EV.id, %(size_str)s)) {',
You should use Event.api() here too.
> ' return; /* Trace Buffer Full, Event Dropped ! */',
> ' }',
> cond=cond,
> diff --git a/scripts/tracetool/format/events_c.py b/scripts/tracetool/format/events_c.py
> index 5f67a7b..07665df 100644
> --- a/scripts/tracetool/format/events_c.py
> +++ b/scripts/tracetool/format/events_c.py
> @@ -28,11 +28,16 @@ def generate(events, backend):
> for e in events:
> out('uint16_t %s;' % e.api(e.QEMU_DSTATE))
> + next_id = 0
> + next_vcpu_id = 0
> for e in events:
> + id = next_id
> + next_id += 1
> if "vcpu" in e.properties:
> - vcpu_id = "TRACE_VCPU_" + e.name.upper()
> + vcpu_id = next_vcpu_id
> + next_vcpu_id += 1
> else:
> - vcpu_id = "TRACE_VCPU_EVENT_COUNT"
> + vcpu_id = "TRACE_VCPU_EVENT_NONE"
> out('TraceEvent %(event)s = {',
> ' .id = %(id)s,',
> ' .vcpu_id = %(vcpu_id)s,',
> @@ -41,17 +46,18 @@ def generate(events, backend):
> ' .dstate = &%(dstate)s ',
> '};',
> event = "TRACE_" + e.name.upper() + "_EV",
> - id = "TRACE_" + e.name.upper(),
> + id = id,
> vcpu_id = vcpu_id,
> name = e.name,
> sstate = "TRACE_%s_ENABLED" % e.name.upper(),
> dstate = e.api(e.QEMU_DSTATE))
> - out('TraceEvent *trace_events[TRACE_EVENT_COUNT] = {')
> + out('TraceEvent *trace_events[] = {')
> for e in events:
> out('&%(event)s,',
> event = "TRACE_" + e.name.upper() + "_EV")
> - out('};',
> + out(' NULL,',
> + '};',
> '')
> diff --git a/scripts/tracetool/format/events_h.py b/scripts/tracetool/format/events_h.py
> index 1478e4c..35cbc91 100644
> --- a/scripts/tracetool/format/events_h.py
> +++ b/scripts/tracetool/format/events_h.py
> @@ -28,27 +28,15 @@ def generate(events, backend):
> for e in events:
> out('extern TraceEvent TRACE_%s_EV;' % e.name.upper())
> - # event identifiers
> - out('typedef enum {')
> -
> - for e in events:
> - out(' TRACE_%s,' % e.name.upper())
> -
> - out(' TRACE_EVENT_COUNT',
> - '} TraceEventID;')
> -
> for e in events:
> out('extern uint16_t %s;' % e.api(e.QEMU_DSTATE))
> - # per-vCPU event identifiers
> - out('typedef enum {')
> -
> + numvcpu = 0
> for e in events:
> if "vcpu" in e.properties:
> - out(' TRACE_VCPU_%s,' % e.name.upper())
> + numvcpu += 1
> - out(' TRACE_VCPU_EVENT_COUNT',
> - '} TraceEventVCPUID;')
> + out("#define TRACE_VCPU_EVENT_COUNT %d" % numvcpu)
> # static state
> for e in events:
> diff --git a/scripts/tracetool/format/h.py b/scripts/tracetool/format/h.py
> index 3763e9a..64a6680 100644
> --- a/scripts/tracetool/format/h.py
> +++ b/scripts/tracetool/format/h.py
> @@ -32,8 +32,7 @@ def generate(events, backend):
> if "vcpu" in e.properties:
> trace_cpu = next(iter(e.args))[1]
> cond = "trace_event_get_vcpu_state(%(cpu)s,"\
> - " TRACE_%(id)s,"\
> - " TRACE_VCPU_%(id)s)"\
> + " TRACE_%(id)s)"\
> % dict(
> cpu=trace_cpu,
> id=e.name.upper())
> diff --git a/trace/control-internal.h b/trace/control-internal.h
> index 52b6b72..c5bb53d 100644
> --- a/trace/control-internal.h
> +++ b/trace/control-internal.h
> @@ -25,20 +25,20 @@ static inline bool trace_event_is_pattern(const char *str)
> return strchr(str, '*') != NULL;
> }
> -static inline TraceEventID trace_event_get_id(TraceEvent *ev)
> +static inline uint32_t trace_event_get_id(TraceEvent *ev)
Return should be size_t here too if the iterator patch uses size_t, right?
Same applies to all replacements of TraceEventID and TraceEventVCPUID.
> {
> assert(ev != NULL);
> return ev->id;
> }
> -static inline TraceEventVCPUID trace_event_get_vcpu_id(TraceEvent *ev)
> +static inline uint32_t trace_event_get_vcpu_id(TraceEvent *ev)
> {
> return ev->vcpu_id;
> }
> static inline bool trace_event_is_vcpu(TraceEvent *ev)
> {
> - return ev->vcpu_id != TRACE_VCPU_EVENT_COUNT;
> + return ev->vcpu_id != TRACE_VCPU_EVENT_NONE;
> }
> static inline const char * trace_event_get_name(TraceEvent *ev)
> @@ -63,11 +63,11 @@ static inline bool trace_event_get_state_dynamic(TraceEvent *ev)
> }
> static inline bool trace_event_get_vcpu_state_dynamic_by_vcpu_id(CPUState *vcpu,
> - TraceEventVCPUID id)
> + uint32_t vcpu_id)
> {
> /* it's on fast path, avoid consistency checks (asserts) */
> if (unlikely(trace_events_enabled_count)) {
> - return test_bit(id, vcpu->trace_dstate);
> + return test_bit(vcpu_id, vcpu->trace_dstate);
> } else {
> return false;
> }
> @@ -76,10 +76,10 @@ static inline bool trace_event_get_vcpu_state_dynamic_by_vcpu_id(CPUState *vcpu,
> static inline bool trace_event_get_vcpu_state_dynamic(CPUState *vcpu,
> TraceEvent *ev)
> {
> - TraceEventVCPUID id;
> + uint32_t vcpu_id;
> assert(trace_event_is_vcpu(ev));
> - id = trace_event_get_vcpu_id(ev);
> - return trace_event_get_vcpu_state_dynamic_by_vcpu_id(vcpu, id);
> + vcpu_id = trace_event_get_vcpu_id(ev);
> + return trace_event_get_vcpu_state_dynamic_by_vcpu_id(vcpu, vcpu_id);
> }
> #endif /* TRACE__CONTROL_INTERNAL_H */
> diff --git a/trace/control-target.c b/trace/control-target.c
> index c69dda9..ff1bf43 100644
> --- a/trace/control-target.c
> +++ b/trace/control-target.c
> @@ -59,7 +59,7 @@ void trace_event_set_state_dynamic(TraceEvent *ev, bool state)
> void trace_event_set_vcpu_state_dynamic(CPUState *vcpu,
> TraceEvent *ev, bool state)
> {
> - TraceEventVCPUID vcpu_id;
> + uint32_t vcpu_id;
> bool state_pre;
> assert(trace_event_get_state_static(ev));
> assert(trace_event_is_vcpu(ev));
> diff --git a/trace/control.c b/trace/control.c
> index 71ad6ba..60235c5 100644
> --- a/trace/control.c
> +++ b/trace/control.c
> @@ -105,7 +105,7 @@ void trace_event_iter_init(TraceEventIter *iter, const char *pattern)
> TraceEvent *trace_event_iter_next(TraceEventIter *iter)
> {
> - while (iter->event < TRACE_EVENT_COUNT) {
> + while (trace_events[iter->event] != NULL) {
> TraceEvent *ev = trace_events[iter->event];
iter-> event++;
> if (!iter->pattern ||
> diff --git a/trace/control.h b/trace/control.h
> index e80c220..c7c0a88 100644
> --- a/trace/control.h
> +++ b/trace/control.h
> @@ -18,17 +18,6 @@ typedef struct TraceEventIter {
> const char *pattern;
> } TraceEventIter;
> -/**
> - * TraceEventID:
> - *
> - * Unique tracing event identifier.
> - *
> - * These are named as 'TRACE_${EVENT_NAME}'.
> - *
> - * See also: "trace/generated-events.h"
> - */
> -enum TraceEventID;
> -
> /**
> * trace_event_iter_init:
> @@ -76,17 +65,17 @@ static bool trace_event_is_pattern(const char *str);
> *
> * Get the identifier of an event.
> */
> -static TraceEventID trace_event_get_id(TraceEvent *ev);
> +static uint32_t trace_event_get_id(TraceEvent *ev);
> /**
> * trace_event_get_vcpu_id:
> *
> * Get the per-vCPU identifier of an event.
> *
> - * Special value #TRACE_VCPU_EVENT_COUNT means the event is not vCPU-specific
> + * Special value #TRACE_VCPU_EVENT_NONE means the event is not vCPU-specific
> * (does not have the "vcpu" property).
> */
> -static TraceEventVCPUID trace_event_get_vcpu_id(TraceEvent *ev);
> +static uint32_t trace_event_get_vcpu_id(TraceEvent *ev);
> /**
> * trace_event_is_vcpu:
> @@ -104,14 +93,12 @@ static const char * trace_event_get_name(TraceEvent *ev);
> /**
> * trace_event_get_state:
> - * @id: Event identifier.
> + * @id: Event identifier name.
> *
> * Get the tracing state of an event (both static and dynamic).
> *
> * If the event has the disabled property, the check will have no performance
> * impact.
> - *
> - * As a down side, you must always use an immediate #TraceEventID value.
> */
> #define trace_event_get_state(id) \
> ((id ##_ENABLED) && trace_event_get_state_dynamic_by_id(id))
> @@ -119,19 +106,16 @@ static const char * trace_event_get_name(TraceEvent *ev);
> /**
> * trace_event_get_vcpu_state:
> * @vcpu: Target vCPU.
> - * @id: Event identifier (TraceEventID).
> - * @vcpu_id: Per-vCPU event identifier (TraceEventVCPUID).
> + * @id: Event identifier name.
> *
> * Get the tracing state of an event (both static and dynamic) for the given
> * vCPU.
> *
> * If the event has the disabled property, the check will have no performance
> * impact.
> - *
> - * As a down side, you must always use an immediate #TraceEventID value.
> */
> -#define trace_event_get_vcpu_state(vcpu, id, vcpu_id) \
> - ((id ##_ENABLED) && trace_event_get_vcpu_state_dynamic_by_vcpu_id(vcpu, vcpu_id))
> +#define trace_event_get_vcpu_state(vcpu, id) \
> + ((id ##_ENABLED) && trace_event_get_vcpu_state_dynamic_by_vcpu_id(vcpu, id ## _EV.vcpu_id))
You should directly use the vCPU id value to keep performance at the same
level.
For that, I'd keep the TraceEventVCPUID enum, or some define for them. Note that
changes would only affect files including the tracing headers for events with
the vcpu property, which will typically be limited to a single header (with the
"guest_" events for now).
You can pre-calculate the .id and .vcpu_id values when reading all events (e.g.,
calculated in tracetool._read_events() and stored in the Event class).
> /**
> * trace_event_get_state_static:
> diff --git a/trace/event-internal.h b/trace/event-internal.h
> index 36906e2..0276804 100644
> --- a/trace/event-internal.h
> +++ b/trace/event-internal.h
> @@ -10,6 +10,12 @@
> #ifndef TRACE__EVENT_INTERNAL_H
> #define TRACE__EVENT_INTERNAL_H
> +/*
> + * Special value for TraceEvent.vcpu_id field to indicate
> + * that the event is not VCPU specific
> + */
> +#define TRACE_VCPU_EVENT_NONE (uint32_t)-1
> +
> /**
> * TraceEvent:
> * @id: Unique event identifier.
> diff --git a/trace/simple.c b/trace/simple.c
> index 2f09daf..716b66d 100644
> --- a/trace/simple.c
> +++ b/trace/simple.c
> @@ -18,7 +18,7 @@
> #include "trace/simple.h"
> /** Trace file header event ID */
> -#define HEADER_EVENT_ID (~(uint64_t)0) /* avoids conflicting with TraceEventIDs */
> +#define HEADER_EVENT_ID (~(uint64_t)0) /* avoids conflicting with trace event IDs */
> /** Trace file magic number */
> #define HEADER_MAGIC 0xf2b177cb0aa429b4ULL
> @@ -58,7 +58,7 @@ static char *trace_file_name;
> /* * Trace buffer entry */
> typedef struct {
> - uint64_t event; /* TraceEventID */
> + uint64_t event; /* event ID value */
> uint64_t timestamp_ns;
> uint32_t length; /* in bytes */
> uint32_t pid;
> @@ -202,7 +202,7 @@ void trace_record_write_str(TraceBufferRecord *rec, const char *s, uint32_t slen
rec-> rec_off = write_to_buffer(rec->rec_off, (void*)s, slen);
> }
> -int trace_record_start(TraceBufferRecord *rec, TraceEventID event, size_t datasize)
> +int trace_record_start(TraceBufferRecord *rec, uint32_t event, size_t datasize)
> {
> unsigned int idx, rec_off, old_idx, new_idx;
> uint32_t rec_len = sizeof(TraceRecord) + datasize;
> diff --git a/trace/simple.h b/trace/simple.h
> index 1e7de45..17ce472 100644
> --- a/trace/simple.h
> +++ b/trace/simple.h
> @@ -33,7 +33,7 @@ typedef struct {
> *
> * @arglen number of bytes required for arguments
> */
> -int trace_record_start(TraceBufferRecord *rec, TraceEventID id, size_t arglen);
> +int trace_record_start(TraceBufferRecord *rec, uint32_t id, size_t arglen);
> /**
> * Append a 64-bit argument to a trace record
> --
> 2.7.4
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [Qemu-devel] [PATCH v3 12/18] trace: dynamically allocate trace_dstate in CPUState
2016-09-19 14:49 ` [Qemu-devel] [PATCH v3 12/18] trace: dynamically allocate trace_dstate in CPUState Daniel P. Berrange
@ 2016-09-19 17:58 ` Lluís Vilanova
0 siblings, 0 replies; 48+ messages in thread
From: Lluís Vilanova @ 2016-09-19 17:58 UTC (permalink / raw)
To: Daniel P. Berrange; +Cc: qemu-devel, Stefan Hajnoczi
Daniel P Berrange writes:
> The CPUState struct has a bitmap tracking which VCPU
> events are currently active. This is indexed based on
> the event ID values, and sized according the maximum
> TraceEventVCPUID enum value.
> When we start dynamically assigning IDs at runtime,
> we can't statically declare a bitmap without making
> an assumption about the max event count. This problem
> can be solved by dynamically allocating the per-CPU
> dstate bitmap.
> Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
> ---
> include/qom/cpu.h | 7 ++++---
> qom/cpu.c | 7 ++++++-
> trace/control.c | 5 +++++
> trace/control.h | 7 +++++++
> 4 files changed, 22 insertions(+), 4 deletions(-)
> diff --git a/include/qom/cpu.h b/include/qom/cpu.h
> index ce0c406..fa746b1 100644
> --- a/include/qom/cpu.h
> +++ b/include/qom/cpu.h
> @@ -27,7 +27,6 @@
> #include "qemu/bitmap.h"
> #include "qemu/queue.h"
> #include "qemu/thread.h"
> -#include "trace/generated-events.h"
> typedef int (*WriteCoreDumpFunction)(const void *buf, size_t size,
> void *opaque);
> @@ -350,8 +349,10 @@ struct CPUState {
> struct KVMState *kvm_state;
> struct kvm_run *kvm_run;
> - /* Used for events with 'vcpu' and *without* the 'disabled' properties */
> - DECLARE_BITMAP(trace_dstate, TRACE_VCPU_EVENT_COUNT);
> + /* Used for events with 'vcpu' and *without* the 'disabled' properties
> + * Dynamically allocated based on BITS_TO_LONGS(trace_get_vcpu_event_count())
Remove this last phrase...
> + */
> + unsigned long *trace_dstate;
> /* TODO Move common fields from CPUArchState here. */
> int cpu_index; /* used by alpha TCG */
> diff --git a/qom/cpu.c b/qom/cpu.c
> index 2553247..3a125b9 100644
> --- a/qom/cpu.c
> +++ b/qom/cpu.c
> @@ -29,6 +29,7 @@
> #include "qemu/error-report.h"
> #include "sysemu/sysemu.h"
> #include "hw/qdev-properties.h"
> +#include "trace/control.h"
> bool cpu_exists(int64_t id)
> {
> @@ -345,12 +346,16 @@ static void cpu_common_initfn(Object *obj)
> qemu_mutex_init(&cpu->work_mutex);
> QTAILQ_INIT(&cpu->breakpoints);
> QTAILQ_INIT(&cpu->watchpoints);
> - bitmap_zero(cpu->trace_dstate, TRACE_VCPU_EVENT_COUNT);
> +
> + cpu->trace_dstate = g_new0(unsigned long,
> + BITS_TO_LONGS(trace_get_vcpu_event_count()));
> }
... and allocate with bitmap_new(trace_get_vcpu_event_count()).
> static void cpu_common_finalize(Object *obj)
> {
> + CPUState *cpu = CPU(obj);
> cpu_exec_exit(CPU(obj));
> + g_free(cpu->trace_dstate);
> }
> static int64_t cpu_common_get_arch_id(CPUState *cpu)
> diff --git a/trace/control.c b/trace/control.c
> index 2db7196..0633774 100644
> --- a/trace/control.c
> +++ b/trace/control.c
> @@ -319,3 +319,8 @@ void trace_init_vcpu_events(void)
> }
> }
> }
> +
> +uint32_t trace_get_vcpu_event_count(void)
> +{
> + return TRACE_VCPU_EVENT_COUNT;
> +}
> diff --git a/trace/control.h b/trace/control.h
> index 265e387..60905f7 100644
> --- a/trace/control.h
> +++ b/trace/control.h
> @@ -234,6 +234,13 @@ char *trace_opt_parse(const char *optarg);
> void trace_init_vcpu_events(void);
> +/**
> + * trace_get_vcpu_event_count:
> + *
> + * Return the number of known vcpu-specific events
> + */
> +uint32_t trace_get_vcpu_event_count(void);
> +
> #include "trace/control-internal.h"
> #endif /* TRACE__CONTROL_H */
> --
> 2.7.4
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [Qemu-devel] [PATCH v3 13/18] trace: dynamically allocate event IDs at runtime
2016-09-19 14:49 ` [Qemu-devel] [PATCH v3 13/18] trace: dynamically allocate event IDs at runtime Daniel P. Berrange
@ 2016-09-19 18:05 ` Lluís Vilanova
2016-09-20 13:50 ` Daniel P. Berrange
0 siblings, 1 reply; 48+ messages in thread
From: Lluís Vilanova @ 2016-09-19 18:05 UTC (permalink / raw)
To: Daniel P. Berrange; +Cc: qemu-devel, Stefan Hajnoczi
Daniel P Berrange writes:
> Instead of having the code generator assign event IDs and
> event VCPU IDs, assign them when the events are registered
> at runtime. This will allow us allow code to be generated
> from individual trace-events without having to figure out
> globally unique numbering at build time.
> Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
> ---
> scripts/tracetool/format/events_c.py | 10 ++--------
> scripts/tracetool/format/events_h.py | 7 -------
> trace/control.c | 11 ++++++++++-
> 3 files changed, 12 insertions(+), 16 deletions(-)
> diff --git a/scripts/tracetool/format/events_c.py b/scripts/tracetool/format/events_c.py
> index 7f00b50..1b5790d 100644
> --- a/scripts/tracetool/format/events_c.py
> +++ b/scripts/tracetool/format/events_c.py
> @@ -28,25 +28,19 @@ def generate(events, backend):
> for e in events:
> out('uint16_t %s;' % e.api(e.QEMU_DSTATE))
> - next_id = 0
> - next_vcpu_id = 0
> for e in events:
> - id = next_id
> - next_id += 1
> if "vcpu" in e.properties:
> - vcpu_id = next_vcpu_id
> - next_vcpu_id += 1
> + vcpu_id = 0
> else:
> vcpu_id = "TRACE_VCPU_EVENT_NONE"
> out('TraceEvent %(event)s = {',
> - ' .id = %(id)s,',
> + ' .id = 0,',
Better to use some invalid value, like in TRACE_VCPU_EVENT_NONE.
> ' .vcpu_id = %(vcpu_id)s,',
> ' .name = \"%(name)s\",',
> ' .sstate = %(sstate)s,',
> ' .dstate = &%(dstate)s ',
> '};',
> event = "TRACE_" + e.name.upper() + "_EV",
> - id = id,
> vcpu_id = vcpu_id,
> name = e.name,
> sstate = "TRACE_%s_ENABLED" % e.name.upper(),
> diff --git a/scripts/tracetool/format/events_h.py b/scripts/tracetool/format/events_h.py
> index 35cbc91..857fcd4 100644
> --- a/scripts/tracetool/format/events_h.py
> +++ b/scripts/tracetool/format/events_h.py
> @@ -31,13 +31,6 @@ def generate(events, backend):
> for e in events:
> out('extern uint16_t %s;' % e.api(e.QEMU_DSTATE))
> - numvcpu = 0
> - for e in events:
> - if "vcpu" in e.properties:
> - numvcpu += 1
> -
> - out("#define TRACE_VCPU_EVENT_COUNT %d" % numvcpu)
> -
> # static state
> for e in events:
> if 'disable' in e.properties:
> diff --git a/trace/control.c b/trace/control.c
> index 0633774..07912bd 100644
> --- a/trace/control.c
> +++ b/trace/control.c
> @@ -35,6 +35,8 @@ typedef struct TraceEventGroup {
> static TraceEventGroup *event_groups;
> static size_t nevent_groups;
> +static uint32_t next_id;
> +static uint32_t next_vcpu_id;
> QemuOptsList qemu_trace_opts = {
> .name = "trace",
> @@ -59,6 +61,13 @@ QemuOptsList qemu_trace_opts = {
> void trace_event_register_group(TraceEvent **events)
> {
> + size_t i;
> + for (i = 0; events[i] != NULL; i++) {
> + events[i]->id = next_id++;
> + if (events[i]->vcpu_id != TRACE_VCPU_EVENT_NONE) {
> + events[i]->vcpu_id = next_vcpu_id++;
> + }
> + }
> event_groups = g_renew(TraceEventGroup, event_groups, nevent_groups + 1);
> event_groups[nevent_groups].events = events;
> nevent_groups++;
> @@ -322,5 +331,5 @@ void trace_init_vcpu_events(void)
> uint32_t trace_get_vcpu_event_count(void)
> {
> - return TRACE_VCPU_EVENT_COUNT;
> + return next_vcpu_id;
> }
> --
> 2.7.4
Aha, now I see your reasoning for referencing event.vcpu_id in the fast-path
instead of using an immediate argument (in trace_event_get_vcpu_dstate_by_id(),
or something named like that).
I still think performance would currently be much better with an immediate, at a
low recompilation cost (for now). Still, the multiple TB cache optimization I
sent, if accepted, might dilute these performance benefits.
Cheers,
Lluis
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [Qemu-devel] [PATCH v3 14/18] trace: get rid of generated-events.h/generated-events.c
2016-09-19 14:49 ` [Qemu-devel] [PATCH v3 14/18] trace: get rid of generated-events.h/generated-events.c Daniel P. Berrange
2016-09-19 16:02 ` Eric Blake
@ 2016-09-19 18:12 ` Lluís Vilanova
1 sibling, 0 replies; 48+ messages in thread
From: Lluís Vilanova @ 2016-09-19 18:12 UTC (permalink / raw)
To: Daniel P. Berrange; +Cc: qemu-devel, Stefan Hajnoczi
Daniel P Berrange writes:
> Currently the generated-events.[ch] files contain the
> event dstates, constants and TraceEvent structs, while the
> generated-tracers.[ch] files contain the actual trace
> probe logic. With the removal of usage of the event enums
> from the API there is no longer any compelling reason for
> the separation between these files. The generated-events.h
> content is only ever be needed from the generated-tracers.[ch]
> files.
> The enums/constants/structs from generated-events.[ch] are
> thus moved into the generated-tracers.[ch], so that there
> is one less file to be generated.
> Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
> ---
> Makefile | 3 ---
> include/trace-tcg.h | 1 -
> include/trace.h | 1 -
> scripts/tracetool/format/c.py | 51 ++++++++++++++++++++++++++++++++++++++-----
> scripts/tracetool/format/h.py | 19 ++++++++++++++++
> trace/Makefile.objs | 28 ++++--------------------
> trace/control.h | 2 +-
> trace/simple.h | 4 ----
> 8 files changed, 70 insertions(+), 39 deletions(-)
> diff --git a/Makefile b/Makefile
> index 50b4b3a..16a35b0 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -56,9 +56,6 @@ GENERATED_SOURCES += qmp-marshal.c qapi-types.c qapi-visit.c qapi-event.c
> GENERATED_HEADERS += qmp-introspect.h
> GENERATED_SOURCES += qmp-introspect.c
> -GENERATED_HEADERS += trace/generated-events.h
> -GENERATED_SOURCES += trace/generated-events.c
> -
> GENERATED_HEADERS += trace/generated-tracers.h
> ifeq ($(findstring dtrace,$(TRACE_BACKENDS)),dtrace)
> GENERATED_HEADERS += trace/generated-tracers-dtrace.h
> diff --git a/include/trace-tcg.h b/include/trace-tcg.h
> index edab4b1..da68608 100644
> --- a/include/trace-tcg.h
> +++ b/include/trace-tcg.h
> @@ -2,6 +2,5 @@
> #define TRACE_TCG_H
> #include "trace/generated-tcg-tracers.h"
> -#include "trace/generated-events.h"
> #endif /* TRACE_TCG_H */
> diff --git a/include/trace.h b/include/trace.h
> index 9a01e44..ac9ff3d 100644
> --- a/include/trace.h
> +++ b/include/trace.h
> @@ -2,6 +2,5 @@
> #define TRACE_H
> #include "trace/generated-tracers.h"
> -#include "trace/generated-events.h"
> #endif /* TRACE_H */
> diff --git a/scripts/tracetool/format/c.py b/scripts/tracetool/format/c.py
> index 699598f..24f8d2e 100644
> --- a/scripts/tracetool/format/c.py
> +++ b/scripts/tracetool/format/c.py
> @@ -17,12 +17,53 @@ from tracetool import out
> def generate(events, backend):
> - events = [e for e in events
> - if "disable" not in e.properties]
> + active_events = [e for e in events
> + if "disable" not in e.properties]
> out('/* This file is autogenerated by tracetool, do not edit. */',
> + '',
> + '#include "qemu/osdep.h"',
> + '#include "trace.h"',
> '')
> - backend.generate_begin(events)
> - for event in events:
> +
> + for e in events:
> + out('uint16_t %s;' % e.api(e.QEMU_DSTATE))
> +
> + for e in events:
> + if "vcpu" in e.properties:
> + vcpu_id = 0
> + else:
> + vcpu_id = "TRACE_VCPU_EVENT_NONE"
> + out('TraceEvent %(event)s = {',
> + ' .id = 0,',
> + ' .vcpu_id = %(vcpu_id)s,',
> + ' .name = \"%(name)s\",',
> + ' .sstate = %(sstate)s,',
> + ' .dstate = &%(dstate)s ',
> + '};',
> + event = "TRACE_" + e.name.upper() + "_EV",
Event.api() again.
> + vcpu_id = vcpu_id,
> + name = e.name,
> + sstate = "TRACE_%s_ENABLED" % e.name.upper(),
> + dstate = e.api(e.QEMU_DSTATE))
> +
> + out('TraceEvent *trace_events[] = {')
> +
> + for e in events:
> + out('&%(event)s,',
> + event = "TRACE_" + e.name.upper() + "_EV")
> +
> + out(' NULL,',
> + '};',
> + '')
> +
> + out('static void trace_register_events(void)',
> + '{',
> + ' trace_event_register_group(trace_events);',
> + '}',
> + 'trace_init(trace_register_events)')
> +
> + backend.generate_begin(active_events)
> + for event in active_events:
> backend.generate(event)
> - backend.generate_end(events)
> + backend.generate_end(active_events)
> diff --git a/scripts/tracetool/format/h.py b/scripts/tracetool/format/h.py
> index 64a6680..f1dc493 100644
> --- a/scripts/tracetool/format/h.py
> +++ b/scripts/tracetool/format/h.py
> @@ -26,6 +26,25 @@ def generate(events, backend):
> '#include "trace/control.h"',
> '')
> + for e in events:
> + out('extern TraceEvent TRACE_%s_EV;' % e.name.upper())
> +
> + for e in events:
> + out('extern uint16_t %s;' % e.api(e.QEMU_DSTATE))
> +
> + # static state
> + for e in events:
> + if 'disable' in e.properties:
> + enabled = 0
> + else:
> + enabled = 1
> + if "tcg-exec" in e.properties:
> + # a single define for the two "sub-events"
> + out('#define TRACE_%(name)s_ENABLED %(enabled)d',
> + name=e.original.name.upper(),
> + enabled=enabled)
> + out('#define TRACE_%s_ENABLED %d' % (e.name.upper(), enabled))
> +
> backend.generate_begin(events)
> for e in events:
> diff --git a/trace/Makefile.objs b/trace/Makefile.objs
> index 4d91b3b..83f754e 100644
> --- a/trace/Makefile.objs
> +++ b/trace/Makefile.objs
> @@ -32,32 +32,11 @@ $(obj)/generated-ust.c-timestamp: $(BUILD_DIR)/trace-events-all $(tracetool-y)
> --backends=$(TRACE_BACKENDS) \
> < $< > $@," GEN $(patsubst %-timestamp,%,$@)")
> -$(obj)/generated-events.h: $(obj)/generated-ust-provider.h
> -$(obj)/generated-events.c: $(obj)/generated-ust.c
> +$(obj)/generated-tracers.h: $(obj)/generated-ust-provider.h
> +$(obj)/generated-tracers.c: $(obj)/generated-ust.c
> endif
> -######################################################################
> -# Auto-generated event descriptions
> -
> -$(obj)/generated-events.h: $(obj)/generated-events.h-timestamp
> - @cmp $< $@ >/dev/null 2>&1 || cp $< $@
> -$(obj)/generated-events.h-timestamp: $(BUILD_DIR)/trace-events-all $(tracetool-y)
> - $(call quiet-command,$(TRACETOOL) \
> - --format=events-h \
> - --backends=$(TRACE_BACKENDS) \
> - < $< > $@," GEN $(patsubst %-timestamp,%,$@)")
> -
> -$(obj)/generated-events.c: $(obj)/generated-events.c-timestamp $(BUILD_DIR)/config-host.mak
> - @cmp $< $@ >/dev/null 2>&1 || cp $< $@
> -$(obj)/generated-events.c-timestamp: $(BUILD_DIR)/trace-events-all $(tracetool-y)
> - $(call quiet-command,$(TRACETOOL) \
> - --format=events-c \
> - --backends=$(TRACE_BACKENDS) \
> - < $< > $@," GEN $(patsubst %-timestamp,%,$@)")
> -
> -util-obj-y += generated-events.o
> -
You should remove files events_[ch].py too.
> ######################################################################
> # Auto-generated tracing routines
> @@ -154,7 +133,8 @@ $(obj)/generated-tcg-tracers.h-timestamp: $(BUILD_DIR)/trace-events-all $(BUILD_
> ######################################################################
> # Backend code
> -util-obj-$(CONFIG_TRACE_SIMPLE) += simple.o generated-tracers.o
> +util-obj-y += generated-tracers.o
> +util-obj-$(CONFIG_TRACE_SIMPLE) += simple.o
> util-obj-$(CONFIG_TRACE_FTRACE) += ftrace.o
> util-obj-$(CONFIG_TRACE_UST) += generated-ust.o
> util-obj-y += control.o
> diff --git a/trace/control.h b/trace/control.h
> index 60905f7..93efcbf 100644
> --- a/trace/control.h
> +++ b/trace/control.h
> @@ -11,7 +11,7 @@
> #define TRACE__CONTROL_H
> #include "qemu-common.h"
> -#include "trace/generated-events.h"
> +#include "event-internal.h"
> typedef struct TraceEventIter {
> size_t event;
> diff --git a/trace/simple.h b/trace/simple.h
> index 17ce472..9931808 100644
> --- a/trace/simple.h
> +++ b/trace/simple.h
> @@ -11,10 +11,6 @@
> #ifndef TRACE_SIMPLE_H
> #define TRACE_SIMPLE_H
> -
> -#include "trace/generated-events.h"
> -
> -
> void st_print_trace_file_status(FILE *stream, fprintf_function stream_printf);
> void st_set_trace_file_enabled(bool enable);
> void st_set_trace_file(const char *file);
> --
> 2.7.4
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [Qemu-devel] [PATCH v3 15/18] trace: rename _read_events to read_events
2016-09-19 14:49 ` [Qemu-devel] [PATCH v3 15/18] trace: rename _read_events to read_events Daniel P. Berrange
@ 2016-09-19 18:15 ` Lluís Vilanova
0 siblings, 0 replies; 48+ messages in thread
From: Lluís Vilanova @ 2016-09-19 18:15 UTC (permalink / raw)
To: Daniel P. Berrange; +Cc: qemu-devel, Stefan Hajnoczi
Daniel P Berrange writes:
> The _read_events method is used by callers outside of
> its module, so should be a public method, not private.
> Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Reviewed-by: Lluís Vilanova <vilanova@ac.upc.edu>
> ---
> scripts/simpletrace.py | 6 +++---
> scripts/tracetool/__init__.py | 14 ++++++++++++--
> 2 files changed, 15 insertions(+), 5 deletions(-)
> diff --git a/scripts/simpletrace.py b/scripts/simpletrace.py
> index 98abb7a..5dc71d3 100755
> --- a/scripts/simpletrace.py
> +++ b/scripts/simpletrace.py
> @@ -12,7 +12,7 @@
> import struct
> import re
> import inspect
> -from tracetool import _read_events, Event
> +from tracetool import read_events, Event
> from tracetool.backend.simple import is_string
> header_event_id = 0xffffffffffffffff
> @@ -128,7 +128,7 @@ class Analyzer(object):
> def process(events, log, analyzer, read_header=True):
> """Invoke an analyzer on each event in a log."""
> if isinstance(events, str):
> - events = _read_events(open(events, 'r'))
> + events = read_events(open(events, 'r'))
> if isinstance(log, str):
> log = open(log, 'rb')
> @@ -187,7 +187,7 @@ def run(analyzer):
> '<trace-file>\n' % sys.argv[0])
> sys.exit(1)
> - events = _read_events(open(sys.argv[1], 'r'))
> + events = read_events(open(sys.argv[1], 'r'))
> process(events, sys.argv[2], analyzer, read_header=read_header)
> if __name__ == '__main__':
> diff --git a/scripts/tracetool/__init__.py b/scripts/tracetool/__init__.py
> index 5191df9..1bb3886 100644
> --- a/scripts/tracetool/__init__.py
> +++ b/scripts/tracetool/__init__.py
> @@ -281,7 +281,17 @@ class Event(object):
> self)
> -def _read_events(fobj):
> +def read_events(fobj):
> + """Generate the output for the given (format, backends) pair.
> +
> + Parameters
> + ----------
> + fobj : file
> + Event description file.
> +
> + Returns a list of Event objects
> + """
> +
> events = []
> for line in fobj:
> if not line.strip():
> @@ -390,6 +400,6 @@ def generate(fevents, format, backends,
> tracetool.backend.dtrace.BINARY = binary
> tracetool.backend.dtrace.PROBEPREFIX = probe_prefix
> - events = _read_events(fevents)
> + events = read_events(fevents)
> tracetool.format.generate(events, format, backend)
> --
> 2.7.4
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [Qemu-devel] [PATCH v3 16/18] trace: push reading of events up a level to tracetool main
2016-09-19 14:49 ` [Qemu-devel] [PATCH v3 16/18] trace: push reading of events up a level to tracetool main Daniel P. Berrange
@ 2016-09-19 18:16 ` Lluís Vilanova
0 siblings, 0 replies; 48+ messages in thread
From: Lluís Vilanova @ 2016-09-19 18:16 UTC (permalink / raw)
To: Daniel P. Berrange; +Cc: qemu-devel, Stefan Hajnoczi
Daniel P Berrange writes:
> Move the reading of events out of the 'tracetool.generate'
> method and into tracetool.main, so that the latter is not
> tied to generating from a single source of events.
> Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Reviewed-by: Lluís Vilanova <vilanova@ac.upc.edu>
> ---
> scripts/tracetool.py | 4 +++-
> scripts/tracetool/__init__.py | 8 +++-----
> 2 files changed, 6 insertions(+), 6 deletions(-)
> diff --git a/scripts/tracetool.py b/scripts/tracetool.py
> index 7b82959..6accbbf 100755
> --- a/scripts/tracetool.py
> +++ b/scripts/tracetool.py
> @@ -129,8 +129,10 @@ def main(args):
> if probe_prefix is None:
> probe_prefix = ".".join(["qemu", target_type, target_name])
> + events = tracetool.read_events(sys.stdin)
> +
> try:
> - tracetool.generate(sys.stdin, arg_format, arg_backends,
> + tracetool.generate(events, arg_format, arg_backends,
> binary=binary, probe_prefix=probe_prefix)
> except tracetool.TracetoolError as e:
> error_opt(str(e))
> diff --git a/scripts/tracetool/__init__.py b/scripts/tracetool/__init__.py
> index 1bb3886..ed668a1 100644
> --- a/scripts/tracetool/__init__.py
> +++ b/scripts/tracetool/__init__.py
> @@ -363,14 +363,14 @@ def try_import(mod_name, attr_name=None, attr_default=None):
> return False, None
> -def generate(fevents, format, backends,
> +def generate(events, format, backends,
> binary=None, probe_prefix=None):
> """Generate the output for the given (format, backends) pair.
> Parameters
> ----------
> - fevents : file
> - Event description file.
> + events : list
> + list of Event objects to generate for
> format : str
> Output format name.
> backends : list
> @@ -400,6 +400,4 @@ def generate(fevents, format, backends,
> tracetool.backend.dtrace.BINARY = binary
> tracetool.backend.dtrace.PROBEPREFIX = probe_prefix
> - events = read_events(fevents)
> -
> tracetool.format.generate(events, format, backend)
> --
> 2.7.4
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [Qemu-devel] [PATCH v3 17/18] trace: pass trace-events to tracetool as a positional param
2016-09-19 14:49 ` [Qemu-devel] [PATCH v3 17/18] trace: pass trace-events to tracetool as a positional param Daniel P. Berrange
@ 2016-09-19 18:18 ` Lluís Vilanova
2016-09-20 13:55 ` Daniel P. Berrange
0 siblings, 1 reply; 48+ messages in thread
From: Lluís Vilanova @ 2016-09-19 18:18 UTC (permalink / raw)
To: Daniel P. Berrange; +Cc: qemu-devel, Stefan Hajnoczi
Daniel P Berrange writes:
> Instead of reading the contents of 'trace-events' from stdin,
> accept the filename as a positional parameter. This also
> allows for reading from multiple files, though this facility
> is not used at this time.
> Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
> ---
> Makefile.target | 6 +++---
> scripts/tracetool.py | 5 ++++-
> trace/Makefile.objs | 18 +++++++++---------
> 3 files changed, 16 insertions(+), 13 deletions(-)
> diff --git a/Makefile.target b/Makefile.target
> index 8c7a072..f227408 100644
> --- a/Makefile.target
> +++ b/Makefile.target
> @@ -55,7 +55,7 @@ $(QEMU_PROG).stp-installed: $(BUILD_DIR)/trace-events-all
> --binary=$(bindir)/$(QEMU_PROG) \
> --target-name=$(TARGET_NAME) \
> --target-type=$(TARGET_TYPE) \
> - < $< > $@," GEN $(TARGET_DIR)$(QEMU_PROG).stp-installed")
> + $< > $@," GEN $(TARGET_DIR)$(QEMU_PROG).stp-installed")
> $(QEMU_PROG).stp: $(BUILD_DIR)/trace-events-all
> $(call quiet-command,$(TRACETOOL) \
> @@ -64,14 +64,14 @@ $(QEMU_PROG).stp: $(BUILD_DIR)/trace-events-all
> --binary=$(realpath .)/$(QEMU_PROG) \
> --target-name=$(TARGET_NAME) \
> --target-type=$(TARGET_TYPE) \
> - < $< > $@," GEN $(TARGET_DIR)$(QEMU_PROG).stp")
> + $< > $@," GEN $(TARGET_DIR)$(QEMU_PROG).stp")
> $(QEMU_PROG)-simpletrace.stp: $(BUILD_DIR)/trace-events-all
> $(call quiet-command,$(TRACETOOL) \
> --format=simpletrace-stap \
> --backends=$(TRACE_BACKENDS) \
> --probe-prefix=qemu.$(TARGET_TYPE).$(TARGET_NAME) \
> - < $< > $@," GEN $(TARGET_DIR)$(QEMU_PROG)-simpletrace.stp")
> + $< > $@," GEN $(TARGET_DIR)$(QEMU_PROG)-simpletrace.stp")
> else
> stap:
> diff --git a/scripts/tracetool.py b/scripts/tracetool.py
> index 6accbbf..f66e767 100755
> --- a/scripts/tracetool.py
> +++ b/scripts/tracetool.py
> @@ -129,7 +129,10 @@ def main(args):
> if probe_prefix is None:
> probe_prefix = ".".join(["qemu", target_type, target_name])
> - events = tracetool.read_events(sys.stdin)
> + if len(args) != 1:
> + error_opt("missing trace-events filepath")
> + with open(args[0], "r") as fh:
> + events = tracetool.read_events(fh)
I'm not sure that's the proper way to check for a positional argument in getopt
(iff it accepts optional args mingled with positional ones).
> try:
> tracetool.generate(events, arg_format, arg_backends,
> diff --git a/trace/Makefile.objs b/trace/Makefile.objs
> index 83f754e..524c4c9 100644
> --- a/trace/Makefile.objs
> +++ b/trace/Makefile.objs
> @@ -22,7 +22,7 @@ $(obj)/generated-ust-provider.h-timestamp: $(BUILD_DIR)/trace-events-all $(trace
> $(call quiet-command,$(TRACETOOL) \
> --format=ust-events-h \
> --backends=$(TRACE_BACKENDS) \
> - < $< > $@," GEN $(patsubst %-timestamp,%,$@)")
> + $< > $@," GEN $(patsubst %-timestamp,%,$@)")
> $(obj)/generated-ust.c: $(obj)/generated-ust.c-timestamp $(BUILD_DIR)/config-host.mak
> @cmp $< $@ >/dev/null 2>&1 || cp $< $@
> @@ -30,7 +30,7 @@ $(obj)/generated-ust.c-timestamp: $(BUILD_DIR)/trace-events-all $(tracetool-y)
> $(call quiet-command,$(TRACETOOL) \
> --format=ust-events-c \
> --backends=$(TRACE_BACKENDS) \
> - < $< > $@," GEN $(patsubst %-timestamp,%,$@)")
> + $< > $@," GEN $(patsubst %-timestamp,%,$@)")
> $(obj)/generated-tracers.h: $(obj)/generated-ust-provider.h
> $(obj)/generated-tracers.c: $(obj)/generated-ust.c
> @@ -50,7 +50,7 @@ $(obj)/generated-tracers.h-timestamp: $(BUILD_DIR)/trace-events-all $(BUILD_DIR)
> $(call quiet-command,$(TRACETOOL) \
> --format=h \
> --backends=$(TRACE_BACKENDS) \
> - < $< > $@," GEN $(patsubst %-timestamp,%,$@)")
> + $< > $@," GEN $(patsubst %-timestamp,%,$@)")
> ##############################
> # non-DTrace
> @@ -61,7 +61,7 @@ $(obj)/generated-tracers.c-timestamp: $(BUILD_DIR)/trace-events-all $(BUILD_DIR)
> $(call quiet-command,$(TRACETOOL) \
> --format=c \
> --backends=$(TRACE_BACKENDS) \
> - < $< > $@," GEN $(patsubst %-timestamp,%,$@)")
> + $< > $@," GEN $(patsubst %-timestamp,%,$@)")
> $(obj)/generated-tracers.o: $(obj)/generated-tracers.c $(obj)/generated-tracers.h
> @@ -79,7 +79,7 @@ $(obj)/generated-tracers-dtrace.dtrace-timestamp: $(BUILD_DIR)/trace-events-all
> $(call quiet-command,$(TRACETOOL) \
> --format=d \
> --backends=$(TRACE_BACKENDS) \
> - < $< > $@," GEN $(patsubst %-timestamp,%,$@)")
> + $< > $@," GEN $(patsubst %-timestamp,%,$@)")
> $(obj)/generated-tracers-dtrace.h: $(obj)/generated-tracers-dtrace.dtrace
> $(call quiet-command,dtrace -o $@ -h -s $<, " GEN $@")
> @@ -98,7 +98,7 @@ $(obj)/generated-helpers-wrappers.h-timestamp: $(BUILD_DIR)/trace-events-all $(B
> $(call quiet-command,$(TRACETOOL) \
> --format=tcg-helper-wrapper-h \
> --backend=$(TRACE_BACKENDS) \
> - < $< > $@," GEN $(patsubst %-timestamp,%,$@)")
> + $< > $@," GEN $(patsubst %-timestamp,%,$@)")
> $(obj)/generated-helpers.h: $(obj)/generated-helpers.h-timestamp
> @cmp $< $@ >/dev/null 2>&1 || cp $< $@
> @@ -106,7 +106,7 @@ $(obj)/generated-helpers.h-timestamp: $(BUILD_DIR)/trace-events-all $(BUILD_DIR)
> $(call quiet-command,$(TRACETOOL) \
> --format=tcg-helper-h \
> --backend=$(TRACE_BACKENDS) \
> - < $< > $@," GEN $(patsubst %-timestamp,%,$@)")
> + $< > $@," GEN $(patsubst %-timestamp,%,$@)")
> $(obj)/generated-helpers.c: $(obj)/generated-helpers.c-timestamp
> @cmp $< $@ >/dev/null 2>&1 || cp $< $@
> @@ -114,7 +114,7 @@ $(obj)/generated-helpers.c-timestamp: $(BUILD_DIR)/trace-events-all $(BUILD_DIR)
> $(call quiet-command,$(TRACETOOL) \
> --format=tcg-helper-c \
> --backend=$(TRACE_BACKENDS) \
> - < $< > $@," GEN $(patsubst %-timestamp,%,$@)")
> + $< > $@," GEN $(patsubst %-timestamp,%,$@)")
> $(obj)/generated-helpers.o: $(obj)/generated-helpers.c
> @@ -127,7 +127,7 @@ $(obj)/generated-tcg-tracers.h-timestamp: $(BUILD_DIR)/trace-events-all $(BUILD_
> $(call quiet-command,$(TRACETOOL) \
> --format=tcg-h \
> --backend=$(TRACE_BACKENDS) \
> - < $< > $@," GEN $(patsubst %-timestamp,%,$@)")
> + $< > $@," GEN $(patsubst %-timestamp,%,$@)")
> ######################################################################
> --
> 2.7.4
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [Qemu-devel] [PATCH v3 18/18] trace: introduce a formal group name for trace events
2016-09-19 14:49 ` [Qemu-devel] [PATCH v3 18/18] trace: introduce a formal group name for trace events Daniel P. Berrange
@ 2016-09-19 18:27 ` Lluís Vilanova
0 siblings, 0 replies; 48+ messages in thread
From: Lluís Vilanova @ 2016-09-19 18:27 UTC (permalink / raw)
To: Daniel P. Berrange; +Cc: qemu-devel, Stefan Hajnoczi
Daniel P Berrange writes:
> The declarations in the generated-tracers.h file are
> assuming there's only ever going to be one instance
> of this header, as they are not namespaced. When we
> have one header per event group, if a single source
> file needs to include multiple sets of trace events,
> the symbols will all clash.
> This change thus introduces a '--group NAME' arg to the
> 'tracetool' program. This will cause all the symbols in
> the generated header files to be given a unique namespace.
> If no group is given, the group name 'common' is used,
> which is suitable for the current usage where there is
> only one global trace-events file used for code generation.
> Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
> ---
> scripts/tracetool.py | 24 +++++++++++++++++++++++-
> scripts/tracetool/__init__.py | 6 ++++--
> scripts/tracetool/backend/__init__.py | 12 ++++++------
> scripts/tracetool/backend/dtrace.py | 4 ++--
> scripts/tracetool/backend/ftrace.py | 5 +++--
> scripts/tracetool/backend/log.py | 4 ++--
> scripts/tracetool/backend/simple.py | 8 ++++----
> scripts/tracetool/backend/syslog.py | 4 ++--
> scripts/tracetool/backend/ust.py | 4 ++--
> scripts/tracetool/format/__init__.py | 4 ++--
> scripts/tracetool/format/c.py | 18 ++++++++++--------
> scripts/tracetool/format/d.py | 2 +-
> scripts/tracetool/format/h.py | 14 +++++++-------
> scripts/tracetool/format/simpletrace_stap.py | 2 +-
> scripts/tracetool/format/stap.py | 2 +-
> scripts/tracetool/format/tcg_h.py | 2 +-
> scripts/tracetool/format/tcg_helper_c.py | 2 +-
> scripts/tracetool/format/tcg_helper_h.py | 2 +-
> scripts/tracetool/format/tcg_helper_wrapper_h.py | 2 +-
> scripts/tracetool/format/ust_events_c.py | 2 +-
> scripts/tracetool/format/ust_events_h.py | 8 ++++----
> 21 files changed, 79 insertions(+), 52 deletions(-)
> diff --git a/scripts/tracetool.py b/scripts/tracetool.py
> index f66e767..0ee66f3 100755
> --- a/scripts/tracetool.py
> +++ b/scripts/tracetool.py
> @@ -15,6 +15,8 @@ __email__ = "stefanha@linux.vnet.ibm.com"
> import sys
> import getopt
> +import os.path
> +import re
> from tracetool import error_write, out
> import tracetool.backend
> @@ -60,6 +62,24 @@ Options:
> else:
> sys.exit(1)
> +def find_git_root(dirname):
> + while dirname != "":
> + git = os.path.join(dirname, ".git")
> + if os.path.exists(git):
> + return dirname
> + dirname = os.path.dirname(dirname)
> +
> + raise ValueError("Cannot find .git directory for %s",
> + filename)
> +
Some people (distributions?) distribute source tarballs without the VCS
files/directories, so this might break.
Even if ugly, it might be easier to just hardcode it based on the script's
relative location:
os.path.abspath(os.path.join(os.dirname(___file___), os.pardir))
> +def make_group_name(filename):
> + dirname = os.path.dirname(filename)
> + gitdir = find_git_root(dirname)
> + dirname = dirname[len(gitdir):]
> +
> + if dirname == "":
> + return "common"
> + return re.sub(r"/|-", "_", dirname)
> def main(args):
> global _SCRIPT
> @@ -134,8 +154,10 @@ def main(args):
> with open(args[0], "r") as fh:
> events = tracetool.read_events(fh)
> + group = make_group_name(args[0])
> +
> try:
> - tracetool.generate(events, arg_format, arg_backends,
> + tracetool.generate(events, group, arg_format, arg_backends,
> binary=binary, probe_prefix=probe_prefix)
> except tracetool.TracetoolError as e:
> error_opt(str(e))
> diff --git a/scripts/tracetool/__init__.py b/scripts/tracetool/__init__.py
> index ed668a1..be8a360 100644
> --- a/scripts/tracetool/__init__.py
> +++ b/scripts/tracetool/__init__.py
> @@ -363,7 +363,7 @@ def try_import(mod_name, attr_name=None, attr_default=None):
> return False, None
> -def generate(events, format, backends,
> +def generate(events, group, format, backends,
> binary=None, probe_prefix=None):
> """Generate the output for the given (format, backends) pair.
> @@ -371,6 +371,8 @@ def generate(events, format, backends,
> ----------
> events : list
> list of Event objects to generate for
> + group: str
> + Name of the tracing group
> format : str
> Output format name.
> backends : list
> @@ -400,4 +402,4 @@ def generate(events, format, backends,
> tracetool.backend.dtrace.BINARY = binary
> tracetool.backend.dtrace.PROBEPREFIX = probe_prefix
> - tracetool.format.generate(events, format, backend)
> + tracetool.format.generate(events, format, backend, group)
> diff --git a/scripts/tracetool/backend/__init__.py b/scripts/tracetool/backend/__init__.py
> index d4b6dab..f735a25 100644
> --- a/scripts/tracetool/backend/__init__.py
> +++ b/scripts/tracetool/backend/__init__.py
> @@ -113,11 +113,11 @@ class Wrapper:
> if func is not None:
> func(*args, **kwargs)
> - def generate_begin(self, events):
> - self._run_function("generate_%s_begin", events)
> + def generate_begin(self, events, group):
> + self._run_function("generate_%s_begin", events, group)
> - def generate(self, event):
> - self._run_function("generate_%s", event)
> + def generate(self, event, group):
> + self._run_function("generate_%s", event, group)
> - def generate_end(self, events):
> - self._run_function("generate_%s_end", events)
> + def generate_end(self, events, group):
> + self._run_function("generate_%s_end", events, group)
> diff --git a/scripts/tracetool/backend/dtrace.py b/scripts/tracetool/backend/dtrace.py
> index ab9ecfa..79505c6 100644
> --- a/scripts/tracetool/backend/dtrace.py
> +++ b/scripts/tracetool/backend/dtrace.py
> @@ -35,12 +35,12 @@ def binary():
> return BINARY
> -def generate_h_begin(events):
> +def generate_h_begin(events, group):
> out('#include "trace/generated-tracers-dtrace.h"',
> '')
> -def generate_h(event):
> +def generate_h(event, group):
> out(' QEMU_%(uppername)s(%(argnames)s);',
> uppername=event.name.upper(),
> argnames=", ".join(event.args.names()))
> diff --git a/scripts/tracetool/backend/ftrace.py b/scripts/tracetool/backend/ftrace.py
> index 4b83b44..8ee1a20 100644
> --- a/scripts/tracetool/backend/ftrace.py
> +++ b/scripts/tracetool/backend/ftrace.py
> @@ -19,12 +19,12 @@ from tracetool import out
> PUBLIC = True
> -def generate_h_begin(events):
> +def generate_h_begin(events, group):
> out('#include "trace/ftrace.h"',
> '')
> -def generate_h(event):
> +def generate_h(event, group):
> argnames = ", ".join(event.args.names())
> if len(event.args) > 0:
> argnames = ", " + argnames
> @@ -40,6 +40,7 @@ def generate_h(event):
> ' unused = write(trace_marker_fd, ftrace_buf, trlen);',
> ' }',
> ' }',
> + group=group.lower(),
This group seems unused.
> name=event.name,
> args=event.args,
> event_id="TRACE_" + event.name.upper(),
> diff --git a/scripts/tracetool/backend/log.py b/scripts/tracetool/backend/log.py
> index 426bb6e..4f4a4d3 100644
> --- a/scripts/tracetool/backend/log.py
> +++ b/scripts/tracetool/backend/log.py
> @@ -19,12 +19,12 @@ from tracetool import out
> PUBLIC = True
> -def generate_h_begin(events):
> +def generate_h_begin(events, group):
> out('#include "qemu/log.h"',
> '')
> -def generate_h(event):
> +def generate_h(event, group):
> argnames = ", ".join(event.args.names())
> if len(event.args) > 0:
> argnames = ", " + argnames
> diff --git a/scripts/tracetool/backend/simple.py b/scripts/tracetool/backend/simple.py
> index 971bd97..b0db50c 100644
> --- a/scripts/tracetool/backend/simple.py
> +++ b/scripts/tracetool/backend/simple.py
> @@ -27,7 +27,7 @@ def is_string(arg):
> return False
> -def generate_h_begin(events):
> +def generate_h_begin(events, group):
> for event in events:
> out('void _simple_%(api)s(%(args)s);',
> api=event.api(),
> @@ -35,13 +35,13 @@ def generate_h_begin(events):
> out('')
> -def generate_h(event):
> +def generate_h(event, group):
> out(' _simple_%(api)s(%(args)s);',
> api=event.api(),
> args=", ".join(event.args.names()))
> -def generate_c_begin(events):
> +def generate_c_begin(events, group):
> out('#include "qemu/osdep.h"',
> '#include "trace.h"',
> '#include "trace/control.h"',
> @@ -49,7 +49,7 @@ def generate_c_begin(events):
> '')
> -def generate_c(event):
> +def generate_c(event, group):
> out('void _simple_%(api)s(%(args)s)',
> '{',
> ' TraceBufferRecord rec;',
> diff --git a/scripts/tracetool/backend/syslog.py b/scripts/tracetool/backend/syslog.py
> index 5f693bd..b8ff279 100644
> --- a/scripts/tracetool/backend/syslog.py
> +++ b/scripts/tracetool/backend/syslog.py
> @@ -19,12 +19,12 @@ from tracetool import out
> PUBLIC = True
> -def generate_h_begin(events):
> +def generate_h_begin(events, group):
> out('#include <syslog.h>',
> '')
> -def generate_h(event):
> +def generate_h(event, group):
> argnames = ", ".join(event.args.names())
> if len(event.args) > 0:
> argnames = ", " + argnames
> diff --git a/scripts/tracetool/backend/ust.py b/scripts/tracetool/backend/ust.py
> index ed4c227..4594db6 100644
> --- a/scripts/tracetool/backend/ust.py
> +++ b/scripts/tracetool/backend/ust.py
> @@ -19,13 +19,13 @@ from tracetool import out
> PUBLIC = True
> -def generate_h_begin(events):
> +def generate_h_begin(events, group):
> out('#include <lttng/tracepoint.h>',
> '#include "trace/generated-ust-provider.h"',
> '')
> -def generate_h(event):
> +def generate_h(event, group):
> argnames = ", ".join(event.args.names())
> if len(event.args) > 0:
> argnames = ", " + argnames
> diff --git a/scripts/tracetool/format/__init__.py b/scripts/tracetool/format/__init__.py
> index 812570f..cf6e0e2 100644
> --- a/scripts/tracetool/format/__init__.py
> +++ b/scripts/tracetool/format/__init__.py
> @@ -74,7 +74,7 @@ def exists(name):
> return tracetool.try_import("tracetool.format." + name)[1]
> -def generate(events, format, backend):
> +def generate(events, format, backend, group):
> if not exists(format):
> raise ValueError("unknown format: %s" % format)
> format = format.replace("-", "_")
> @@ -82,4 +82,4 @@ def generate(events, format, backend):
> "generate")[1]
> if func is None:
> raise AttributeError("format has no 'generate': %s" % format)
> - func(events, backend)
> + func(events, backend, group)
> diff --git a/scripts/tracetool/format/c.py b/scripts/tracetool/format/c.py
> index 24f8d2e..31438fa 100644
> --- a/scripts/tracetool/format/c.py
> +++ b/scripts/tracetool/format/c.py
> @@ -16,7 +16,7 @@ __email__ = "stefanha@linux.vnet.ibm.com"
> from tracetool import out
> -def generate(events, backend):
> +def generate(events, backend, group):
> active_events = [e for e in events
> if "disable" not in e.properties]
> @@ -47,7 +47,8 @@ def generate(events, backend):
> sstate = "TRACE_%s_ENABLED" % e.name.upper(),
> dstate = e.api(e.QEMU_DSTATE))
> - out('TraceEvent *trace_events[] = {')
> + out('TraceEvent *%(group)s_trace_events[] = {',
> + group = group.lower())
> for e in events:
> out('&%(event)s,',
> @@ -57,13 +58,14 @@ def generate(events, backend):
> '};',
> '')
> - out('static void trace_register_events(void)',
> + out('static void trace_%(group)s_register_events(void)',
> '{',
> - ' trace_event_register_group(trace_events);',
> + ' trace_event_register_group(%(group)s_trace_events);',
> '}',
> - 'trace_init(trace_register_events)')
> + 'trace_init(trace_%(group)s_register_events)',
> + group = group.lower())
> - backend.generate_begin(active_events)
> + backend.generate_begin(active_events, group)
> for event in active_events:
> - backend.generate(event)
> - backend.generate_end(active_events)
> + backend.generate(event, group)
> + backend.generate_end(active_events, group)
> diff --git a/scripts/tracetool/format/d.py b/scripts/tracetool/format/d.py
> index c77d5b7..78397c2 100644
> --- a/scripts/tracetool/format/d.py
> +++ b/scripts/tracetool/format/d.py
> @@ -29,7 +29,7 @@ RESERVED_WORDS = (
> )
> -def generate(events, backend):
> +def generate(events, backend, group):
> events = [e for e in events
> if "disable" not in e.properties]
> diff --git a/scripts/tracetool/format/h.py b/scripts/tracetool/format/h.py
> index f1dc493..3f1d5e9 100644
> --- a/scripts/tracetool/format/h.py
> +++ b/scripts/tracetool/format/h.py
> @@ -16,11 +16,11 @@ __email__ = "stefanha@linux.vnet.ibm.com"
> from tracetool import out
> -def generate(events, backend):
> +def generate(events, backend, group):
> out('/* This file is autogenerated by tracetool, do not edit. */',
> '',
> - '#ifndef TRACE__GENERATED_TRACERS_H',
> - '#define TRACE__GENERATED_TRACERS_H',
> + '#ifndef TRACE_%s_GENERATED_TRACERS_H' % group.upper(),
> + '#define TRACE_%s_GENERATED_TRACERS_H' % group.upper(),
> '',
> '#include "qemu-common.h"',
> '#include "trace/control.h"',
> @@ -45,7 +45,7 @@ def generate(events, backend):
> enabled=enabled)
> out('#define TRACE_%s_ENABLED %d' % (e.name.upper(), enabled))
> - backend.generate_begin(events)
> + backend.generate_begin(events, group)
> for e in events:
> if "vcpu" in e.properties:
> @@ -67,11 +67,11 @@ def generate(events, backend):
> cond=cond)
> if "disable" not in e.properties:
> - backend.generate(e)
> + backend.generate(e, group)
> out(' }',
> '}')
> - backend.generate_end(events)
> + backend.generate_end(events, group)
> - out('#endif /* TRACE__GENERATED_TRACERS_H */')
> + out('#endif /* TRACE_%s_GENERATED_TRACERS_H */' % group.upper())
> diff --git a/scripts/tracetool/format/simpletrace_stap.py b/scripts/tracetool/format/simpletrace_stap.py
> index 0573f43..3d700ca 100644
> --- a/scripts/tracetool/format/simpletrace_stap.py
> +++ b/scripts/tracetool/format/simpletrace_stap.py
> @@ -19,7 +19,7 @@ from tracetool.backend.simple import is_string
> from tracetool.format.stap import stap_escape
> -def generate(events, backend):
> +def generate(events, backend, group):
> out('/* This file is autogenerated by tracetool, do not edit. */',
> '',
> 'global event_name_to_id_map',
> diff --git a/scripts/tracetool/format/stap.py b/scripts/tracetool/format/stap.py
> index 9e780f1..e8ef3e7 100644
> --- a/scripts/tracetool/format/stap.py
> +++ b/scripts/tracetool/format/stap.py
> @@ -34,7 +34,7 @@ def stap_escape(identifier):
> return identifier
> -def generate(events, backend):
> +def generate(events, backend, group):
> events = [e for e in events
> if "disable" not in e.properties]
> diff --git a/scripts/tracetool/format/tcg_h.py b/scripts/tracetool/format/tcg_h.py
> index e2331f2..628388a 100644
> --- a/scripts/tracetool/format/tcg_h.py
> +++ b/scripts/tracetool/format/tcg_h.py
> @@ -27,7 +27,7 @@ def vcpu_transform_args(args):
> ])
> -def generate(events, backend):
> +def generate(events, backend, group):
> out('/* This file is autogenerated by tracetool, do not edit. */',
> '/* You must include this file after the inclusion of helper.h */',
> '',
> diff --git a/scripts/tracetool/format/tcg_helper_c.py b/scripts/tracetool/format/tcg_helper_c.py
> index e3485b7..cc26e03 100644
> --- a/scripts/tracetool/format/tcg_helper_c.py
> +++ b/scripts/tracetool/format/tcg_helper_c.py
> @@ -40,7 +40,7 @@ def vcpu_transform_args(args, mode):
> assert False
> -def generate(events, backend):
> +def generate(events, backend, group):
> events = [e for e in events
> if "disable" not in e.properties]
> diff --git a/scripts/tracetool/format/tcg_helper_h.py b/scripts/tracetool/format/tcg_helper_h.py
> index dc76c15..6b184b6 100644
> --- a/scripts/tracetool/format/tcg_helper_h.py
> +++ b/scripts/tracetool/format/tcg_helper_h.py
> @@ -18,7 +18,7 @@ from tracetool.transform import *
> import tracetool.vcpu
> -def generate(events, backend):
> +def generate(events, backend, group):
> events = [e for e in events
> if "disable" not in e.properties]
> diff --git a/scripts/tracetool/format/tcg_helper_wrapper_h.py b/scripts/tracetool/format/tcg_helper_wrapper_h.py
> index 020f442..ff53447 100644
> --- a/scripts/tracetool/format/tcg_helper_wrapper_h.py
> +++ b/scripts/tracetool/format/tcg_helper_wrapper_h.py
> @@ -18,7 +18,7 @@ from tracetool.transform import *
> import tracetool.vcpu
> -def generate(events, backend):
> +def generate(events, backend, group):
> events = [e for e in events
> if "disable" not in e.properties]
> diff --git a/scripts/tracetool/format/ust_events_c.py b/scripts/tracetool/format/ust_events_c.py
> index 9967c7a..cd87d8a 100644
> --- a/scripts/tracetool/format/ust_events_c.py
> +++ b/scripts/tracetool/format/ust_events_c.py
> @@ -16,7 +16,7 @@ __email__ = "stefanha@redhat.com"
> from tracetool import out
> -def generate(events, backend):
> +def generate(events, backend, group):
> events = [e for e in events
> if "disabled" not in e.properties]
> diff --git a/scripts/tracetool/format/ust_events_h.py b/scripts/tracetool/format/ust_events_h.py
> index 3e8a7cd..00b69d9 100644
> --- a/scripts/tracetool/format/ust_events_h.py
> +++ b/scripts/tracetool/format/ust_events_h.py
> @@ -16,7 +16,7 @@ __email__ = "stefanha@redhat.com"
> from tracetool import out
> -def generate(events, backend):
> +def generate(events, backend, group):
> events = [e for e in events
> if "disabled" not in e.properties]
> @@ -28,8 +28,8 @@ def generate(events, backend):
> '#undef TRACEPOINT_INCLUDE_FILE',
> '#define TRACEPOINT_INCLUDE_FILE ./generated-ust-provider.h',
> '',
> - '#if !defined (TRACE__GENERATED_UST_H) || defined(TRACEPOINT_HEADER_MULTI_READ)',
> - '#define TRACE__GENERATED_UST_H',
> + '#if !defined (TRACE_%s_GENERATED_UST_H) || defined(TRACEPOINT_HEADER_MULTI_READ)' % group.upper(),
> + '#define TRACE_%s_GENERATED_UST_H' % group.upper(),
> '',
> '#include "qemu-common.h"',
> '#include <lttng/tracepoint.h>',
> @@ -94,7 +94,7 @@ def generate(events, backend):
> '',
> name=e.name)
> - out('#endif /* TRACE__GENERATED_UST_H */',
> + out('#endif /* TRACE_%s_GENERATED_UST_H */' % group.upper(),
> '',
> '/* This part must be outside ifdef protection */',
> '#include <lttng/tracepoint-event.h>')
> --
> 2.7.4
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [Qemu-devel] [PATCH v3 02/18] trace: convert code to use event iterators
2016-09-19 16:59 ` Lluís Vilanova
@ 2016-09-20 13:13 ` Daniel P. Berrange
2016-09-20 13:36 ` Lluís Vilanova
0 siblings, 1 reply; 48+ messages in thread
From: Daniel P. Berrange @ 2016-09-20 13:13 UTC (permalink / raw)
To: qemu-devel, Stefan Hajnoczi
On Mon, Sep 19, 2016 at 06:59:17PM +0200, Lluís Vilanova wrote:
> Daniel P Berrange writes:
>
> > This converts the HMP/QMP monitor API implementations
> > and some internal trace control methods to use the new
> > trace event iterator APIs.
>
> > Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
> > Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
> > ---
> > monitor.c | 26 ++++++++--------
> > trace/control.c | 92 +++++++++++++++++++++++++++++++++------------------------
> > trace/qmp.c | 16 ++++++----
> > 3 files changed, 78 insertions(+), 56 deletions(-)
>
> > diff --git a/monitor.c b/monitor.c
> > index 5c00373..ae70157 100644
> > --- a/monitor.c
> > +++ b/monitor.c
> > @@ -3335,13 +3335,14 @@ void info_trace_events_completion(ReadLineState *rs, int nb_args, const char *st
> > len = strlen(str);
> > readline_set_completion_index(rs, len);
> > if (nb_args == 2) {
> > - TraceEventID id;
> > - for (id = 0; id < trace_event_count(); id++) {
> > - const char *event_name = trace_event_get_name(trace_event_id(id));
> > - if (!strncmp(str, event_name, len)) {
> > - readline_add_completion(rs, event_name);
> > - }
> > + TraceEventIter iter;
> > + TraceEvent *ev;
> > + char *pattern = g_strdup_printf("%s*", str);
> > + trace_event_iter_init(&iter, pattern);
> > + while ((ev = trace_event_iter_next(&iter)) != NULL) {
> > + readline_add_completion(rs, trace_event_get_name(ev));
> > }
> > + g_free(pattern);
> > }
> > }
>
> > @@ -3352,13 +3353,14 @@ void trace_event_completion(ReadLineState *rs, int nb_args, const char *str)
> > len = strlen(str);
> > readline_set_completion_index(rs, len);
> > if (nb_args == 2) {
> > - TraceEventID id;
> > - for (id = 0; id < trace_event_count(); id++) {
> > - const char *event_name = trace_event_get_name(trace_event_id(id));
> > - if (!strncmp(str, event_name, len)) {
> > - readline_add_completion(rs, event_name);
> > - }
> > + TraceEventIter iter;
> > + TraceEvent *ev;
> > + char *pattern = g_strdup_printf("%s*", str);
> > + trace_event_iter_init(&iter, pattern);
> > + while ((ev = trace_event_iter_next(&iter)) != NULL) {
> > + readline_add_completion(rs, trace_event_get_name(ev));
> > }
> > + g_free(pattern);
> > } else if (nb_args == 3) {
> > add_completion_option(rs, str, "on");
> > add_completion_option(rs, str, "off");
> > diff --git a/trace/control.c b/trace/control.c
> > index 1a96049..b471146 100644
> > --- a/trace/control.c
> > +++ b/trace/control.c
> > @@ -60,9 +60,10 @@ TraceEvent *trace_event_name(const char *name)
> > {
> > assert(name != NULL);
>
> > - TraceEventID i;
> > - for (i = 0; i < trace_event_count(); i++) {
> > - TraceEvent *ev = trace_event_id(i);
> > + TraceEventIter iter;
> > + TraceEvent *ev;
> > + trace_event_iter_init(&iter, NULL);
> > + while ((ev = trace_event_iter_next(&iter)) != NULL) {
> > if (strcmp(trace_event_get_name(ev), name) == 0) {
> > return ev;
> > }
> > @@ -105,21 +106,18 @@ TraceEvent *trace_event_pattern(const char *pat, TraceEvent *ev)
> > {
> > assert(pat != NULL);
>
> > - TraceEventID i;
> > -
> > - if (ev == NULL) {
> > - i = -1;
> > - } else {
> > - i = trace_event_get_id(ev);
> > - }
> > - i++;
> > -
> > - while (i < trace_event_count()) {
> > - TraceEvent *res = trace_event_id(i);
> > - if (pattern_glob(pat, trace_event_get_name(res))) {
> > - return res;
> > + bool matched = ev ? false : true;
> > + TraceEventIter iter;
> > + TraceEvent *thisev;
> > + trace_event_iter_init(&iter, pat);
> > + while ((thisev = trace_event_iter_next(&iter)) != NULL) {
> > + if (matched) {
> > + return thisev;
> > + } else {
> > + if (ev == thisev) {
> > + matched = true;
> > + }
> > }
> > - i++;
> > }
>
> > return NULL;
> > @@ -148,10 +146,11 @@ TraceEvent *trace_event_iter_next(TraceEventIter *iter)
>
> > void trace_list_events(void)
> > {
> > - int i;
> > - for (i = 0; i < trace_event_count(); i++) {
> > - TraceEvent *res = trace_event_id(i);
> > - fprintf(stderr, "%s\n", trace_event_get_name(res));
> > + TraceEventIter iter;
> > + TraceEvent *ev;
> > + trace_event_iter_init(&iter, NULL);
> > + while ((ev = trace_event_iter_next(&iter)) != NULL) {
> > + fprintf(stderr, "%s\n", trace_event_get_name(ev));
> > }
> > }
>
> > @@ -159,25 +158,40 @@ static void do_trace_enable_events(const char *line_buf)
> > {
> > const bool enable = ('-' != line_buf[0]);
> > const char *line_ptr = enable ? line_buf : line_buf + 1;
> > -
> > - if (trace_event_is_pattern(line_ptr)) {
> > - TraceEvent *ev = NULL;
> > - while ((ev = trace_event_pattern(line_ptr, ev)) != NULL) {
> > + TraceEventIter iter;
> > + TraceEvent *ev;
> > + bool is_pattern = trace_event_is_pattern(line_ptr);
> > +
> > + trace_event_iter_init(&iter, is_pattern ? line_ptr : NULL);
> > + while ((ev = trace_event_iter_next(&iter)) != NULL) {
> > + bool match = false;
> > + if (is_pattern) {
> > if (trace_event_get_state_static(ev)) {
> > - trace_event_set_state_dynamic_init(ev, enable);
> > + match = true;
> > }
> > - }
> > - } else {
> > - TraceEvent *ev = trace_event_name(line_ptr);
> > - if (ev == NULL) {
> > - error_report("WARNING: trace event '%s' does not exist",
> > - line_ptr);
> > - } else if (!trace_event_get_state_static(ev)) {
> > - error_report("WARNING: trace event '%s' is not traceable",
> > - line_ptr);
> > } else {
> > - trace_event_set_state_dynamic_init(ev, enable);
> > + if (g_str_equal(trace_event_get_name(ev),
> > + line_ptr)) {
>
> Why do some places use strcmp() and others g_str_equal() (the former are only on
> previously existing lines).
g_str_equal is clearer to follow, as you can see what the
intended semantics are, without having to look to the end of
the expression for a == 0 or != 0 and then remember which of
them means eq vs not-eq.
> If you maintain calls to trace_event_name() instead of iterating on both paths,
> the function used to compare names would be "unique". And would also make the
> warning logic at the end easier to follow (even if you call
> _set_state_dynamic_init() from two places instead of one).
We can actually simplify in a different way - if pattern_glob is
passed a pattern without any wildcards, it'll do an exact match,
so we can just rely on that in both cases.
Regards,
Daniel
--
|: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org -o- http://virt-manager.org :|
|: http://autobuild.org -o- http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [Qemu-devel] [PATCH v3 06/18] trace: break circular dependancy in event-internal.h
2016-09-19 17:08 ` Lluís Vilanova
@ 2016-09-20 13:24 ` Daniel P. Berrange
0 siblings, 0 replies; 48+ messages in thread
From: Daniel P. Berrange @ 2016-09-20 13:24 UTC (permalink / raw)
To: qemu-devel, Stefan Hajnoczi
On Mon, Sep 19, 2016 at 07:08:57PM +0200, Lluís Vilanova wrote:
> Typo in subject: dependancy -> dependency
>
> Daniel P Berrange writes:
>
> > Currently event-internal.h includes generated-events.h,
> > while generated-events.h includes event-internal.h
> > causing a circular dependency.
>
> > event-internal.h requires that the content of
> > generated-events.h comes first, so that it can see
> > the typedefs for TraceEventID and TraceEventVCPUID.
>
> > Switching the TraceEvent struct to use uint32_t
> > for the two ID fields, removes the dependency on
> > the typedef, allowing events-internal.h to be a
> > self-contained header. This will then let the patch
> > following this move event-internal.h to the top of
> > generated-events.h, so we can expose TraceEvent
> > struct variables in generated-events.h
>
> > Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
> > ---
> > trace/event-internal.h | 7 ++-----
> > 1 file changed, 2 insertions(+), 5 deletions(-)
>
> > diff --git a/trace/event-internal.h b/trace/event-internal.h
> > index 3b9ceb5..36906e2 100644
> > --- a/trace/event-internal.h
> > +++ b/trace/event-internal.h
> > @@ -10,9 +10,6 @@
> > #ifndef TRACE__EVENT_INTERNAL_H
> > #define TRACE__EVENT_INTERNAL_H
>
> > -#include "trace/generated-events.h"
> > -
> > -
> > /**
> > * TraceEvent:
> > * @id: Unique event identifier.
> > @@ -28,8 +25,8 @@
> > * Opaque generic description of a tracing event.
> > */
> > typedef struct TraceEvent {
> > - TraceEventID id;
> > - TraceEventVCPUID vcpu_id;
> > + uint32_t id;
> > + uint32_t vcpu_id;
>
> Shouldn't these be 'size_t' for consistency with your iterator patch?
No, the iterator is using size_t because it is looping over array
entries and the logical max number of elements of an array in C is
the max value of size_t.
The ID values we assign events are fixed to 32-bits because that
is what we're encoding them as in simple trace.
Since we're going to have multiple groups of events we won't
have the assumption that ID values are the same as array
indexes by the end of the series.
IOW, I think it is correct as is.
Regards,
Daniel
--
|: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org -o- http://virt-manager.org :|
|: http://autobuild.org -o- http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [Qemu-devel] [PATCH v3 08/18] trace: remove the TraceEventID and TraceEventVCPUID enums
2016-09-19 17:48 ` Lluís Vilanova
@ 2016-09-20 13:29 ` Daniel P. Berrange
0 siblings, 0 replies; 48+ messages in thread
From: Daniel P. Berrange @ 2016-09-20 13:29 UTC (permalink / raw)
To: qemu-devel, Stefan Hajnoczi
On Mon, Sep 19, 2016 at 07:48:59PM +0200, Lluís Vilanova wrote:
> Daniel P Berrange writes:
>
> > The TraceEventID and TraceEventVCPUID enums constants are
> > no longer actually used for anything critical.
>
> > The TRACE_EVENT_COUNT limit is used to determine the size
> > of the TraceEvents array, and can be removed if we just
> > NULL terminate the array instead.
>
> > The TRACE_EVENT_VCPU_COUNT limit is used as a magic value
>
> It's TRACE_VCPU_EVENT_COUNT.
>
>
> > for marking non-vCPU events, and also for declaring the
> > size of the trace dstate mask in the CPUState struct.
> > The former usage can be replaced by a dedicated constant
> > TRACE_EVENT_VCPU_NONE, defined as (uint32_t)-1. For the
> > latter usage, we can simply define a constant for the
> > number of VCPUs, avoiding the need for the full enum.
>
> > The only other usages of the enum values can be replaced
> > by accesing the id/vcpu_id fields via the named TraceEvent
> > structs.
>
> > Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
> > ---
> > scripts/tracetool/backend/simple.py | 2 +-
> > scripts/tracetool/format/events_c.py | 16 +++++++++++-----
> > scripts/tracetool/format/events_h.py | 18 +++---------------
> > scripts/tracetool/format/h.py | 3 +--
> > trace/control-internal.h | 16 ++++++++--------
> > trace/control-target.c | 2 +-
> > trace/control.c | 2 +-
> > trace/control.h | 30 +++++++-----------------------
> > trace/event-internal.h | 6 ++++++
> > trace/simple.c | 6 +++---
> > trace/simple.h | 2 +-
> > 11 files changed, 43 insertions(+), 60 deletions(-)
>
> > diff --git a/scripts/tracetool/backend/simple.py b/scripts/tracetool/backend/simple.py
> > index 1bccada..971bd97 100644
> > --- a/scripts/tracetool/backend/simple.py
> > +++ b/scripts/tracetool/backend/simple.py
> > @@ -80,7 +80,7 @@ def generate_c(event):
> > ' return;',
> > ' }',
> > '',
> > - ' if (trace_record_start(&rec, %(event_id)s, %(size_str)s)) {',
> > + ' if (trace_record_start(&rec, %(event_id)s_EV.id, %(size_str)s)) {',
>
> You should use Event.api() here too.
>
>
> > ' return; /* Trace Buffer Full, Event Dropped ! */',
> > ' }',
> > cond=cond,
> > diff --git a/scripts/tracetool/format/events_c.py b/scripts/tracetool/format/events_c.py
> > index 5f67a7b..07665df 100644
> > --- a/scripts/tracetool/format/events_c.py
> > +++ b/scripts/tracetool/format/events_c.py
> > @@ -28,11 +28,16 @@ def generate(events, backend):
> > for e in events:
> > out('uint16_t %s;' % e.api(e.QEMU_DSTATE))
>
> > + next_id = 0
> > + next_vcpu_id = 0
> > for e in events:
> > + id = next_id
> > + next_id += 1
> > if "vcpu" in e.properties:
> > - vcpu_id = "TRACE_VCPU_" + e.name.upper()
> > + vcpu_id = next_vcpu_id
> > + next_vcpu_id += 1
> > else:
> > - vcpu_id = "TRACE_VCPU_EVENT_COUNT"
> > + vcpu_id = "TRACE_VCPU_EVENT_NONE"
> > out('TraceEvent %(event)s = {',
> > ' .id = %(id)s,',
> > ' .vcpu_id = %(vcpu_id)s,',
> > @@ -41,17 +46,18 @@ def generate(events, backend):
> > ' .dstate = &%(dstate)s ',
> > '};',
> > event = "TRACE_" + e.name.upper() + "_EV",
> > - id = "TRACE_" + e.name.upper(),
> > + id = id,
> > vcpu_id = vcpu_id,
> > name = e.name,
> > sstate = "TRACE_%s_ENABLED" % e.name.upper(),
> > dstate = e.api(e.QEMU_DSTATE))
>
> > - out('TraceEvent *trace_events[TRACE_EVENT_COUNT] = {')
> > + out('TraceEvent *trace_events[] = {')
>
> > for e in events:
> > out('&%(event)s,',
> > event = "TRACE_" + e.name.upper() + "_EV")
>
> > - out('};',
> > + out(' NULL,',
> > + '};',
> > '')
> > diff --git a/scripts/tracetool/format/events_h.py b/scripts/tracetool/format/events_h.py
> > index 1478e4c..35cbc91 100644
> > --- a/scripts/tracetool/format/events_h.py
> > +++ b/scripts/tracetool/format/events_h.py
> > @@ -28,27 +28,15 @@ def generate(events, backend):
> > for e in events:
> > out('extern TraceEvent TRACE_%s_EV;' % e.name.upper())
>
> > - # event identifiers
> > - out('typedef enum {')
> > -
> > - for e in events:
> > - out(' TRACE_%s,' % e.name.upper())
> > -
> > - out(' TRACE_EVENT_COUNT',
> > - '} TraceEventID;')
> > -
> > for e in events:
> > out('extern uint16_t %s;' % e.api(e.QEMU_DSTATE))
>
> > - # per-vCPU event identifiers
> > - out('typedef enum {')
> > -
> > + numvcpu = 0
> > for e in events:
> > if "vcpu" in e.properties:
> > - out(' TRACE_VCPU_%s,' % e.name.upper())
> > + numvcpu += 1
>
> > - out(' TRACE_VCPU_EVENT_COUNT',
> > - '} TraceEventVCPUID;')
> > + out("#define TRACE_VCPU_EVENT_COUNT %d" % numvcpu)
>
> > # static state
> > for e in events:
> > diff --git a/scripts/tracetool/format/h.py b/scripts/tracetool/format/h.py
> > index 3763e9a..64a6680 100644
> > --- a/scripts/tracetool/format/h.py
> > +++ b/scripts/tracetool/format/h.py
> > @@ -32,8 +32,7 @@ def generate(events, backend):
> > if "vcpu" in e.properties:
> > trace_cpu = next(iter(e.args))[1]
> > cond = "trace_event_get_vcpu_state(%(cpu)s,"\
> > - " TRACE_%(id)s,"\
> > - " TRACE_VCPU_%(id)s)"\
> > + " TRACE_%(id)s)"\
> > % dict(
> > cpu=trace_cpu,
> > id=e.name.upper())
> > diff --git a/trace/control-internal.h b/trace/control-internal.h
> > index 52b6b72..c5bb53d 100644
> > --- a/trace/control-internal.h
> > +++ b/trace/control-internal.h
> > @@ -25,20 +25,20 @@ static inline bool trace_event_is_pattern(const char *str)
> > return strchr(str, '*') != NULL;
> > }
>
> > -static inline TraceEventID trace_event_get_id(TraceEvent *ev)
> > +static inline uint32_t trace_event_get_id(TraceEvent *ev)
>
> Return should be size_t here too if the iterator patch uses size_t, right?
No, see my response in the previous patch for why ID values
are not the same as iterator event array indexes.
> > @@ -119,19 +106,16 @@ static const char * trace_event_get_name(TraceEvent *ev);
> > /**
> > * trace_event_get_vcpu_state:
> > * @vcpu: Target vCPU.
> > - * @id: Event identifier (TraceEventID).
> > - * @vcpu_id: Per-vCPU event identifier (TraceEventVCPUID).
> > + * @id: Event identifier name.
> > *
> > * Get the tracing state of an event (both static and dynamic) for the given
> > * vCPU.
> > *
> > * If the event has the disabled property, the check will have no performance
> > * impact.
> > - *
> > - * As a down side, you must always use an immediate #TraceEventID value.
> > */
> > -#define trace_event_get_vcpu_state(vcpu, id, vcpu_id) \
> > - ((id ##_ENABLED) && trace_event_get_vcpu_state_dynamic_by_vcpu_id(vcpu, vcpu_id))
> > +#define trace_event_get_vcpu_state(vcpu, id) \
> > + ((id ##_ENABLED) && trace_event_get_vcpu_state_dynamic_by_vcpu_id(vcpu, id ## _EV.vcpu_id))
>
> You should directly use the vCPU id value to keep performance at the same
> level.
>
> For that, I'd keep the TraceEventVCPUID enum, or some define for them. Note that
> changes would only affect files including the tracing headers for events with
> the vcpu property, which will typically be limited to a single header (with the
> "guest_" events for now).
>
> You can pre-calculate the .id and .vcpu_id values when reading all events (e.g.,
> calculated in tracetool._read_events() and stored in the Event class).
No, this entire series is about explicitly *NOT* having to pre-calculate
event ID values at time of generation, as that inherantly involves
re-generating all code when ID values change in any single trace-events
file and I want to avoid the assumptions that all vcpu events are in the
same file that my earlier posting had.
If the performance problem is genuinely a problem we can switch to
having a 'int TRACE_EVENT_XXXXX_VCPU_ID' variable per event and
then having 'TraceEvent' struct contain a 'int *vcpu_id', but I
think we should only do that if there's a measurable performance
problem demonstrated.
Regards,
Daniel
--
|: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org -o- http://virt-manager.org :|
|: http://autobuild.org -o- http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [Qemu-devel] [PATCH v3 02/18] trace: convert code to use event iterators
2016-09-20 13:13 ` Daniel P. Berrange
@ 2016-09-20 13:36 ` Lluís Vilanova
0 siblings, 0 replies; 48+ messages in thread
From: Lluís Vilanova @ 2016-09-20 13:36 UTC (permalink / raw)
To: Daniel P. Berrange; +Cc: qemu-devel, Stefan Hajnoczi
Daniel P Berrange writes:
> On Mon, Sep 19, 2016 at 06:59:17PM +0200, Lluís Vilanova wrote:
>> Daniel P Berrange writes:
>>
>> > This converts the HMP/QMP monitor API implementations
>> > and some internal trace control methods to use the new
>> > trace event iterator APIs.
>>
>> > Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
>> > Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
>> > ---
>> > monitor.c | 26 ++++++++--------
>> > trace/control.c | 92 +++++++++++++++++++++++++++++++++------------------------
>> > trace/qmp.c | 16 ++++++----
>> > 3 files changed, 78 insertions(+), 56 deletions(-)
>>
>> > diff --git a/monitor.c b/monitor.c
>> > index 5c00373..ae70157 100644
>> > --- a/monitor.c
>> > +++ b/monitor.c
>> > @@ -3335,13 +3335,14 @@ void info_trace_events_completion(ReadLineState *rs, int nb_args, const char *st
>> > len = strlen(str);
>> > readline_set_completion_index(rs, len);
>> > if (nb_args == 2) {
>> > - TraceEventID id;
>> > - for (id = 0; id < trace_event_count(); id++) {
>> > - const char *event_name = trace_event_get_name(trace_event_id(id));
>> > - if (!strncmp(str, event_name, len)) {
>> > - readline_add_completion(rs, event_name);
>> > - }
>> > + TraceEventIter iter;
>> > + TraceEvent *ev;
>> > + char *pattern = g_strdup_printf("%s*", str);
>> > + trace_event_iter_init(&iter, pattern);
>> > + while ((ev = trace_event_iter_next(&iter)) != NULL) {
>> > + readline_add_completion(rs, trace_event_get_name(ev));
>> > }
>> > + g_free(pattern);
>> > }
>> > }
>>
>> > @@ -3352,13 +3353,14 @@ void trace_event_completion(ReadLineState *rs, int nb_args, const char *str)
>> > len = strlen(str);
>> > readline_set_completion_index(rs, len);
>> > if (nb_args == 2) {
>> > - TraceEventID id;
>> > - for (id = 0; id < trace_event_count(); id++) {
>> > - const char *event_name = trace_event_get_name(trace_event_id(id));
>> > - if (!strncmp(str, event_name, len)) {
>> > - readline_add_completion(rs, event_name);
>> > - }
>> > + TraceEventIter iter;
>> > + TraceEvent *ev;
>> > + char *pattern = g_strdup_printf("%s*", str);
>> > + trace_event_iter_init(&iter, pattern);
>> > + while ((ev = trace_event_iter_next(&iter)) != NULL) {
>> > + readline_add_completion(rs, trace_event_get_name(ev));
>> > }
>> > + g_free(pattern);
>> > } else if (nb_args == 3) {
>> > add_completion_option(rs, str, "on");
>> > add_completion_option(rs, str, "off");
>> > diff --git a/trace/control.c b/trace/control.c
>> > index 1a96049..b471146 100644
>> > --- a/trace/control.c
>> > +++ b/trace/control.c
>> > @@ -60,9 +60,10 @@ TraceEvent *trace_event_name(const char *name)
>> > {
>> > assert(name != NULL);
>>
>> > - TraceEventID i;
>> > - for (i = 0; i < trace_event_count(); i++) {
>> > - TraceEvent *ev = trace_event_id(i);
>> > + TraceEventIter iter;
>> > + TraceEvent *ev;
>> > + trace_event_iter_init(&iter, NULL);
>> > + while ((ev = trace_event_iter_next(&iter)) != NULL) {
>> > if (strcmp(trace_event_get_name(ev), name) == 0) {
>> > return ev;
>> > }
>> > @@ -105,21 +106,18 @@ TraceEvent *trace_event_pattern(const char *pat, TraceEvent *ev)
>> > {
>> > assert(pat != NULL);
>>
>> > - TraceEventID i;
>> > -
>> > - if (ev == NULL) {
>> > - i = -1;
>> > - } else {
>> > - i = trace_event_get_id(ev);
>> > - }
>> > - i++;
>> > -
>> > - while (i < trace_event_count()) {
>> > - TraceEvent *res = trace_event_id(i);
>> > - if (pattern_glob(pat, trace_event_get_name(res))) {
>> > - return res;
>> > + bool matched = ev ? false : true;
>> > + TraceEventIter iter;
>> > + TraceEvent *thisev;
>> > + trace_event_iter_init(&iter, pat);
>> > + while ((thisev = trace_event_iter_next(&iter)) != NULL) {
>> > + if (matched) {
>> > + return thisev;
>> > + } else {
>> > + if (ev == thisev) {
>> > + matched = true;
>> > + }
>> > }
>> > - i++;
>> > }
>>
>> > return NULL;
>> > @@ -148,10 +146,11 @@ TraceEvent *trace_event_iter_next(TraceEventIter *iter)
>>
>> > void trace_list_events(void)
>> > {
>> > - int i;
>> > - for (i = 0; i < trace_event_count(); i++) {
>> > - TraceEvent *res = trace_event_id(i);
>> > - fprintf(stderr, "%s\n", trace_event_get_name(res));
>> > + TraceEventIter iter;
>> > + TraceEvent *ev;
>> > + trace_event_iter_init(&iter, NULL);
>> > + while ((ev = trace_event_iter_next(&iter)) != NULL) {
>> > + fprintf(stderr, "%s\n", trace_event_get_name(ev));
>> > }
>> > }
>>
>> > @@ -159,25 +158,40 @@ static void do_trace_enable_events(const char *line_buf)
>> > {
>> > const bool enable = ('-' != line_buf[0]);
>> > const char *line_ptr = enable ? line_buf : line_buf + 1;
>> > -
>> > - if (trace_event_is_pattern(line_ptr)) {
>> > - TraceEvent *ev = NULL;
>> > - while ((ev = trace_event_pattern(line_ptr, ev)) != NULL) {
>> > + TraceEventIter iter;
>> > + TraceEvent *ev;
>> > + bool is_pattern = trace_event_is_pattern(line_ptr);
>> > +
>> > + trace_event_iter_init(&iter, is_pattern ? line_ptr : NULL);
>> > + while ((ev = trace_event_iter_next(&iter)) != NULL) {
>> > + bool match = false;
>> > + if (is_pattern) {
>> > if (trace_event_get_state_static(ev)) {
>> > - trace_event_set_state_dynamic_init(ev, enable);
>> > + match = true;
>> > }
>> > - }
>> > - } else {
>> > - TraceEvent *ev = trace_event_name(line_ptr);
>> > - if (ev == NULL) {
>> > - error_report("WARNING: trace event '%s' does not exist",
>> > - line_ptr);
>> > - } else if (!trace_event_get_state_static(ev)) {
>> > - error_report("WARNING: trace event '%s' is not traceable",
>> > - line_ptr);
>> > } else {
>> > - trace_event_set_state_dynamic_init(ev, enable);
>> > + if (g_str_equal(trace_event_get_name(ev),
>> > + line_ptr)) {
>>
>> Why do some places use strcmp() and others g_str_equal() (the former are only on
>> previously existing lines).
> g_str_equal is clearer to follow, as you can see what the
> intended semantics are, without having to look to the end of
> the expression for a == 0 or != 0 and then remember which of
> them means eq vs not-eq.
Yes. I was actually thinking of porting the checks on other functions you
changed to g_str_equal().
>> If you maintain calls to trace_event_name() instead of iterating on both paths,
>> the function used to compare names would be "unique". And would also make the
>> warning logic at the end easier to follow (even if you call
>> _set_state_dynamic_init() from two places instead of one).
> We can actually simplify in a different way - if pattern_glob is
> passed a pattern without any wildcards, it'll do an exact match,
> so we can just rely on that in both cases.
That'll work too, and it's one of the reasons why I proposed to merge pattern
and exact name matching into the iterator interface.
I only added exact name matches to avoid the extra typing of the iteration loop
and a final check to see if any event matched. But trace_event_name() is only
used in two places, making trace_event_name() less useful.
We only have to be careful with the semantic difference between non-pattern and
pattern-based operations in the UI. Non-pattern operations have to show an error
if there is no match, while pattern-based operations don't complain if the
pattern has no matches.
Cheers,
Lluis
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [Qemu-devel] [PATCH v3 13/18] trace: dynamically allocate event IDs at runtime
2016-09-19 18:05 ` Lluís Vilanova
@ 2016-09-20 13:50 ` Daniel P. Berrange
2016-09-20 17:45 ` Lluís Vilanova
0 siblings, 1 reply; 48+ messages in thread
From: Daniel P. Berrange @ 2016-09-20 13:50 UTC (permalink / raw)
To: qemu-devel, Stefan Hajnoczi
On Mon, Sep 19, 2016 at 08:05:12PM +0200, Lluís Vilanova wrote:
> Daniel P Berrange writes:
>
> > Instead of having the code generator assign event IDs and
> > event VCPU IDs, assign them when the events are registered
> > at runtime. This will allow us allow code to be generated
> > from individual trace-events without having to figure out
> > globally unique numbering at build time.
>
> > Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
> > ---
> > scripts/tracetool/format/events_c.py | 10 ++--------
> > scripts/tracetool/format/events_h.py | 7 -------
> > trace/control.c | 11 ++++++++++-
> > 3 files changed, 12 insertions(+), 16 deletions(-)
>
> > diff --git a/scripts/tracetool/format/events_c.py b/scripts/tracetool/format/events_c.py
> > index 7f00b50..1b5790d 100644
> > --- a/scripts/tracetool/format/events_c.py
> > +++ b/scripts/tracetool/format/events_c.py
> > @@ -28,25 +28,19 @@ def generate(events, backend):
> > for e in events:
> > out('uint16_t %s;' % e.api(e.QEMU_DSTATE))
>
> > - next_id = 0
> > - next_vcpu_id = 0
> > for e in events:
> > - id = next_id
> > - next_id += 1
> > if "vcpu" in e.properties:
> > - vcpu_id = next_vcpu_id
> > - next_vcpu_id += 1
> > + vcpu_id = 0
> > else:
> > vcpu_id = "TRACE_VCPU_EVENT_NONE"
> > out('TraceEvent %(event)s = {',
> > - ' .id = %(id)s,',
> > + ' .id = 0,',
>
> Better to use some invalid value, like in TRACE_VCPU_EVENT_NONE.
I don't think it adds anything todo that - TRACE_VCPU_EVENT_NONE is
special because it is a persistent value for lifetime of QEMU
that will be used by runtime comparisons. In contrast this is
just a placeholder that gets replaced by the real value immediately
at startup in trace_event_register_group(). We never even check
the statically set value of 'id' - we just unconditionally replace
it with the real value.
Regards,
Daniel
--
|: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org -o- http://virt-manager.org :|
|: http://autobuild.org -o- http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [Qemu-devel] [PATCH v3 17/18] trace: pass trace-events to tracetool as a positional param
2016-09-19 18:18 ` Lluís Vilanova
@ 2016-09-20 13:55 ` Daniel P. Berrange
2016-09-20 17:46 ` Lluís Vilanova
0 siblings, 1 reply; 48+ messages in thread
From: Daniel P. Berrange @ 2016-09-20 13:55 UTC (permalink / raw)
To: qemu-devel, Stefan Hajnoczi
On Mon, Sep 19, 2016 at 08:18:51PM +0200, Lluís Vilanova wrote:
> Daniel P Berrange writes:
>
> > Instead of reading the contents of 'trace-events' from stdin,
> > accept the filename as a positional parameter. This also
> > allows for reading from multiple files, though this facility
> > is not used at this time.
>
> > Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
> > ---
> > Makefile.target | 6 +++---
> > scripts/tracetool.py | 5 ++++-
> > trace/Makefile.objs | 18 +++++++++---------
> > 3 files changed, 16 insertions(+), 13 deletions(-)
>
> > diff --git a/scripts/tracetool.py b/scripts/tracetool.py
> > index 6accbbf..f66e767 100755
> > --- a/scripts/tracetool.py
> > +++ b/scripts/tracetool.py
> > @@ -129,7 +129,10 @@ def main(args):
> > if probe_prefix is None:
> > probe_prefix = ".".join(["qemu", target_type, target_name])
>
> > - events = tracetool.read_events(sys.stdin)
> > + if len(args) != 1:
> > + error_opt("missing trace-events filepath")
> > + with open(args[0], "r") as fh:
> > + events = tracetool.read_events(fh)
>
> I'm not sure that's the proper way to check for a positional argument in getopt
> (iff it accepts optional args mingled with positional ones).
'args' comes from the return value of getopt.getopt(sys.argv)
which is documented as:
"The return value consists of two elements: the first is a
list of (option, value) pairs; the second is the list of
program arguments left after the option list was stripped
(this is a trailing slice of args"
Regards,
Daniel
--
|: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org -o- http://virt-manager.org :|
|: http://autobuild.org -o- http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [Qemu-devel] [PATCH v3 13/18] trace: dynamically allocate event IDs at runtime
2016-09-20 13:50 ` Daniel P. Berrange
@ 2016-09-20 17:45 ` Lluís Vilanova
0 siblings, 0 replies; 48+ messages in thread
From: Lluís Vilanova @ 2016-09-20 17:45 UTC (permalink / raw)
To: Daniel P. Berrange; +Cc: qemu-devel, Stefan Hajnoczi
Daniel P Berrange writes:
> On Mon, Sep 19, 2016 at 08:05:12PM +0200, Lluís Vilanova wrote:
>> Daniel P Berrange writes:
>>
>> > Instead of having the code generator assign event IDs and
>> > event VCPU IDs, assign them when the events are registered
>> > at runtime. This will allow us allow code to be generated
>> > from individual trace-events without having to figure out
>> > globally unique numbering at build time.
>>
>> > Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
>> > ---
>> > scripts/tracetool/format/events_c.py | 10 ++--------
>> > scripts/tracetool/format/events_h.py | 7 -------
>> > trace/control.c | 11 ++++++++++-
>> > 3 files changed, 12 insertions(+), 16 deletions(-)
>>
>> > diff --git a/scripts/tracetool/format/events_c.py b/scripts/tracetool/format/events_c.py
>> > index 7f00b50..1b5790d 100644
>> > --- a/scripts/tracetool/format/events_c.py
>> > +++ b/scripts/tracetool/format/events_c.py
>> > @@ -28,25 +28,19 @@ def generate(events, backend):
>> > for e in events:
>> > out('uint16_t %s;' % e.api(e.QEMU_DSTATE))
>>
>> > - next_id = 0
>> > - next_vcpu_id = 0
>> > for e in events:
>> > - id = next_id
>> > - next_id += 1
>> > if "vcpu" in e.properties:
>> > - vcpu_id = next_vcpu_id
>> > - next_vcpu_id += 1
>> > + vcpu_id = 0
>> > else:
>> > vcpu_id = "TRACE_VCPU_EVENT_NONE"
>> > out('TraceEvent %(event)s = {',
>> > - ' .id = %(id)s,',
>> > + ' .id = 0,',
>>
>> Better to use some invalid value, like in TRACE_VCPU_EVENT_NONE.
> I don't think it adds anything todo that - TRACE_VCPU_EVENT_NONE is
> special because it is a persistent value for lifetime of QEMU
> that will be used by runtime comparisons. In contrast this is
> just a placeholder that gets replaced by the real value immediately
> at startup in trace_event_register_group(). We never even check
> the statically set value of 'id' - we just unconditionally replace
> it with the real value.
Makes sense.
Thanks,
Lluis
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [Qemu-devel] [PATCH v3 17/18] trace: pass trace-events to tracetool as a positional param
2016-09-20 13:55 ` Daniel P. Berrange
@ 2016-09-20 17:46 ` Lluís Vilanova
0 siblings, 0 replies; 48+ messages in thread
From: Lluís Vilanova @ 2016-09-20 17:46 UTC (permalink / raw)
To: Daniel P. Berrange; +Cc: qemu-devel, Stefan Hajnoczi
Daniel P Berrange writes:
> On Mon, Sep 19, 2016 at 08:18:51PM +0200, Lluís Vilanova wrote:
>> Daniel P Berrange writes:
>>
>> > Instead of reading the contents of 'trace-events' from stdin,
>> > accept the filename as a positional parameter. This also
>> > allows for reading from multiple files, though this facility
>> > is not used at this time.
>>
>> > Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
>> > ---
>> > Makefile.target | 6 +++---
>> > scripts/tracetool.py | 5 ++++-
>> > trace/Makefile.objs | 18 +++++++++---------
>> > 3 files changed, 16 insertions(+), 13 deletions(-)
>>
>> > diff --git a/scripts/tracetool.py b/scripts/tracetool.py
>> > index 6accbbf..f66e767 100755
>> > --- a/scripts/tracetool.py
>> > +++ b/scripts/tracetool.py
>> > @@ -129,7 +129,10 @@ def main(args):
>> > if probe_prefix is None:
>> > probe_prefix = ".".join(["qemu", target_type, target_name])
>>
>> > - events = tracetool.read_events(sys.stdin)
>> > + if len(args) != 1:
>> > + error_opt("missing trace-events filepath")
>> > + with open(args[0], "r") as fh:
>> > + events = tracetool.read_events(fh)
>>
>> I'm not sure that's the proper way to check for a positional argument in getopt
>> (iff it accepts optional args mingled with positional ones).
> 'args' comes from the return value of getopt.getopt(sys.argv)
> which is documented as:
> "The return value consists of two elements: the first is a
> list of (option, value) pairs; the second is the list of
> program arguments left after the option list was stripped
> (this is a trailing slice of args"
Oh, I'm sorry. I should've looked more closely into the code.
Cheers,
Lluis
^ permalink raw reply [flat|nested] 48+ messages in thread
end of thread, other threads:[~2016-09-20 17:46 UTC | newest]
Thread overview: 48+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-09-19 14:48 [Qemu-devel] [PATCH v3 00/18] Refactor trace to allow modular build Daniel P. Berrange
2016-09-19 14:48 ` [Qemu-devel] [PATCH v3 01/18] trace: add trace event iterator APIs Daniel P. Berrange
2016-09-19 16:39 ` Lluís Vilanova
2016-09-19 14:48 ` [Qemu-devel] [PATCH v3 02/18] trace: convert code to use event iterators Daniel P. Berrange
2016-09-19 16:59 ` Lluís Vilanova
2016-09-20 13:13 ` Daniel P. Berrange
2016-09-20 13:36 ` Lluís Vilanova
2016-09-19 14:48 ` [Qemu-devel] [PATCH v3 03/18] trace: remove some now unused functions Daniel P. Berrange
2016-09-19 17:00 ` Lluís Vilanova
2016-09-19 17:24 ` Daniel P. Berrange
2016-09-19 14:48 ` [Qemu-devel] [PATCH v3 04/18] trace: remove global 'uint16 dstate[]' array Daniel P. Berrange
2016-09-19 15:55 ` Eric Blake
2016-09-19 17:05 ` Lluís Vilanova
2016-09-19 14:48 ` [Qemu-devel] [PATCH v3 05/18] trace: remove duplicate control.h includes in generated-tracers.h Daniel P. Berrange
2016-09-19 17:06 ` Lluís Vilanova
2016-09-19 14:48 ` [Qemu-devel] [PATCH v3 06/18] trace: break circular dependancy in event-internal.h Daniel P. Berrange
2016-09-19 17:08 ` Lluís Vilanova
2016-09-20 13:24 ` Daniel P. Berrange
2016-09-19 14:48 ` [Qemu-devel] [PATCH v3 07/18] trace: give each trace event a named TraceEvent struct Daniel P. Berrange
2016-09-19 17:17 ` Lluís Vilanova
2016-09-19 14:48 ` [Qemu-devel] [PATCH v3 08/18] trace: remove the TraceEventID and TraceEventVCPUID enums Daniel P. Berrange
2016-09-19 17:48 ` Lluís Vilanova
2016-09-20 13:29 ` Daniel P. Berrange
2016-09-19 14:49 ` [Qemu-devel] [PATCH v3 09/18] trace: emit name <-> ID mapping in simpletrace header Daniel P. Berrange
2016-09-19 14:49 ` [Qemu-devel] [PATCH v3 10/18] trace: don't abort qemu if ftrace can't be initialized Daniel P. Berrange
2016-09-19 14:49 ` [Qemu-devel] [PATCH v3 11/18] trace: provide mechanism for registering trace events Daniel P. Berrange
2016-09-19 14:49 ` [Qemu-devel] [PATCH v3 12/18] trace: dynamically allocate trace_dstate in CPUState Daniel P. Berrange
2016-09-19 17:58 ` Lluís Vilanova
2016-09-19 14:49 ` [Qemu-devel] [PATCH v3 13/18] trace: dynamically allocate event IDs at runtime Daniel P. Berrange
2016-09-19 18:05 ` Lluís Vilanova
2016-09-20 13:50 ` Daniel P. Berrange
2016-09-20 17:45 ` Lluís Vilanova
2016-09-19 14:49 ` [Qemu-devel] [PATCH v3 14/18] trace: get rid of generated-events.h/generated-events.c Daniel P. Berrange
2016-09-19 16:02 ` Eric Blake
2016-09-19 18:12 ` Lluís Vilanova
2016-09-19 14:49 ` [Qemu-devel] [PATCH v3 15/18] trace: rename _read_events to read_events Daniel P. Berrange
2016-09-19 18:15 ` Lluís Vilanova
2016-09-19 14:49 ` [Qemu-devel] [PATCH v3 16/18] trace: push reading of events up a level to tracetool main Daniel P. Berrange
2016-09-19 18:16 ` Lluís Vilanova
2016-09-19 14:49 ` [Qemu-devel] [PATCH v3 17/18] trace: pass trace-events to tracetool as a positional param Daniel P. Berrange
2016-09-19 18:18 ` Lluís Vilanova
2016-09-20 13:55 ` Daniel P. Berrange
2016-09-20 17:46 ` Lluís Vilanova
2016-09-19 14:49 ` [Qemu-devel] [PATCH v3 18/18] trace: introduce a formal group name for trace events Daniel P. Berrange
2016-09-19 18:27 ` Lluís Vilanova
2016-09-19 15:54 ` [Qemu-devel] [PATCH v3 00/18] Refactor trace to allow modular build no-reply
2016-09-19 16:00 ` Daniel P. Berrange
2016-09-19 17:13 ` no-reply
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.