From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44545) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bsS6e-0004EV-BV for qemu-devel@nongnu.org; Fri, 07 Oct 2016 06:10:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bsS6c-0004gL-H9 for qemu-devel@nongnu.org; Fri, 07 Oct 2016 06:10:20 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37174) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bsS6c-0004fY-6j for qemu-devel@nongnu.org; Fri, 07 Oct 2016 06:10:18 -0400 From: Stefan Hajnoczi Date: Fri, 7 Oct 2016 11:09:31 +0100 Message-Id: <1475834979-4980-13-git-send-email-stefanha@redhat.com> In-Reply-To: <1475834979-4980-1-git-send-email-stefanha@redhat.com> References: <1475834979-4980-1-git-send-email-stefanha@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 12/20] trace: provide mechanism for registering trace events List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , "Daniel P. Berrange" , Stefan Hajnoczi From: "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. The module_call_init() needs to be invoked at the start of any program that wants to make use of the trace support. Currently this covers system emulators qemu-nbd, qemu-img and qemu-io. Reviewed-by: Stefan Hajnoczi Reviewed-by: Llu=C3=ADs Vilanova Signed-off-by: Daniel P. Berrange Message-id: 1475588159-30598-14-git-send-email-berrange@redhat.com Signed-off-by: Stefan Hajnoczi --- 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 dc2c9d4..877cca7 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; =20 @@ -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) =20 #define block_module_load_one(lib) module_load_one("block-", lib) =20 diff --git a/qemu-img.c b/qemu-img.c index ceffefe..02c07b9 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -4165,6 +4165,7 @@ int main(int argc, char **argv) signal(SIGPIPE, SIG_IGN); #endif =20 + module_call_init(MODULE_INIT_TRACE); error_set_progname(argv[0]); qemu_init_exec_dir(argv[0]); =20 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 =20 + module_call_init(MODULE_INIT_TRACE); progname =3D basename(argv[0]); qemu_init_exec_dir(argv[0]); =20 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 =3D termsig_handler; sigaction(SIGTERM, &sa_sigterm, NULL); =20 + module_call_init(MODULE_INIT_TRACE); qcrypto_init(&error_fatal); =20 module_call_init(MODULE_INIT_QOM); diff --git a/scripts/tracetool/format/events_c.py b/scripts/tracetool/for= mat/events_c.py index 40ae395..8817555 100644 --- a/scripts/tracetool/format/events_c.py +++ b/scripts/tracetool/format/events_c.py @@ -60,3 +60,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 9abbc96..a9d395a 100644 --- a/trace/control-internal.h +++ b/trace/control-internal.h @@ -15,7 +15,6 @@ #include "qom/cpu.h" =20 =20 -extern TraceEvent *trace_events[]; extern int trace_events_enabled_count; =20 =20 @@ -83,4 +82,7 @@ static inline bool trace_event_get_vcpu_state_dynamic(C= PUState *vcpu, return trace_event_get_vcpu_state_dynamic_by_vcpu_id(vcpu, vcpu_id); } =20 + +void trace_event_register_group(TraceEvent **events); + #endif /* TRACE__CONTROL_INTERNAL_H */ diff --git a/trace/control.c b/trace/control.c index 6b32511..a231327 100644 --- a/trace/control.c +++ b/trace/control.c @@ -29,6 +29,13 @@ =20 int trace_events_enabled_count; =20 +typedef struct TraceEventGroup { + TraceEvent **events; +} TraceEventGroup; + +static TraceEventGroup *event_groups; +static size_t nevent_groups; + QemuOptsList qemu_trace_opts =3D { .name =3D "trace", .implied_opt_name =3D "enable", @@ -50,6 +57,14 @@ QemuOptsList qemu_trace_opts =3D { }; =20 =20 +void trace_event_register_group(TraceEvent **events) +{ + event_groups =3D g_renew(TraceEventGroup, event_groups, nevent_group= s + 1); + event_groups[nevent_groups].events =3D events; + nevent_groups++; +} + + TraceEvent *trace_event_name(const char *name) { assert(name !=3D NULL); @@ -100,14 +115,20 @@ static bool pattern_glob(const char *pat, const cha= r *ev) void trace_event_iter_init(TraceEventIter *iter, const char *pattern) { iter->event =3D 0; + iter->group =3D 0; iter->pattern =3D pattern; } =20 TraceEvent *trace_event_iter_next(TraceEventIter *iter) { - while (trace_events[iter->event] !=3D NULL) { - TraceEvent *ev =3D trace_events[iter->event]; + while (iter->group < nevent_groups && + event_groups[iter->group].events[iter->event] !=3D NULL) { + TraceEvent *ev =3D event_groups[iter->group].events[iter->event]= ; iter->event++; + if (event_groups[iter->group].events[iter->event] =3D=3D NULL) { + iter->event =3D 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 cccd2a2..3f30a0c 100644 --- a/trace/control.h +++ b/trace/control.h @@ -15,6 +15,7 @@ =20 typedef struct TraceEventIter { size_t event; + size_t group; const char *pattern; } TraceEventIter; =20 diff --git a/vl.c b/vl.c index f3abd99..610539a 100644 --- a/vl.c +++ b/vl.c @@ -3020,6 +3020,8 @@ int main(int argc, char **argv, char **envp) Error *err =3D NULL; bool list_data_dirs =3D false; =20 + module_call_init(MODULE_INIT_TRACE); + qemu_init_cpu_list(); qemu_init_cpu_loop(); qemu_mutex_lock_iothread(); --=20 2.7.4