From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56371) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zm362-0004dr-Cu for qemu-devel@nongnu.org; Tue, 13 Oct 2015 13:10:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zm361-0000dm-0K for qemu-devel@nongnu.org; Tue, 13 Oct 2015 13:10:42 -0400 Received: from roura.ac.upc.es ([147.83.33.10]:55445) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zm360-0000dY-Ji for qemu-devel@nongnu.org; Tue, 13 Oct 2015 13:10:40 -0400 From: =?utf-8?b?TGx1w61z?= Vilanova Date: Tue, 13 Oct 2015 19:10:38 +0200 Message-Id: <20151013171038.21325.97389.stgit@localhost> In-Reply-To: <20151013171020.21325.27626.stgit@localhost> References: <20151013171020.21325.27626.stgit@localhost> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCHv13/8] trace: [tcg] Identify events with the 'vcpu' property List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , Markus Armbruster , Stefan Hajnoczi Signed-off-by: Llu=C3=ADs Vilanova --- qapi/trace.json | 5 +++-- scripts/tracetool/format/events_c.py | 11 +++++++++-- scripts/tracetool/format/events_h.py | 12 +++++++++++- trace/control-internal.h | 8 +++++++- trace/control.h | 7 +++++++ trace/event-internal.h | 4 +++- trace/qmp.c | 2 ++ 7 files changed, 42 insertions(+), 7 deletions(-) diff --git a/qapi/trace.json b/qapi/trace.json index 01b0a52..94a3a3b 100644 --- a/qapi/trace.json +++ b/qapi/trace.json @@ -1,6 +1,6 @@ # -*- mode: python -*- # -# Copyright (C) 2011-2014 Llu=C3=ADs Vilanova +# Copyright (C) 2011-2015 Llu=C3=ADs Vilanova # # This work is licensed under the terms of the GNU GPL, version 2 or lat= er. # See the COPYING file in the top-level directory. @@ -29,11 +29,12 @@ # # @name: Event name. # @state: Tracing state. +# @vcpu: Whether this is a per-vCPU event. # # Since 2.2 ## { 'struct': 'TraceEventInfo', - 'data': {'name': 'str', 'state': 'TraceEventState'} } + 'data': {'name': 'str', 'state': 'TraceEventState', 'vcpu': 'bool'} } =20 ## # @trace-event-get-state: diff --git a/scripts/tracetool/format/events_c.py b/scripts/tracetool/for= mat/events_c.py index 2d97fa3..693f6d7 100644 --- a/scripts/tracetool/format/events_c.py +++ b/scripts/tracetool/format/events_c.py @@ -6,7 +6,7 @@ trace/generated-events.c """ =20 __author__ =3D "Llu=C3=ADs Vilanova " -__copyright__ =3D "Copyright 2012-2014, Llu=C3=ADs Vilanova " +__copyright__ =3D "Copyright 2012-2015, Llu=C3=ADs Vilanova " __license__ =3D "GPL version 2 or (at your option) any later version" =20 __maintainer__ =3D "Stefan Hajnoczi" @@ -27,8 +27,15 @@ def generate(events, backend): out('TraceEvent trace_events[TRACE_EVENT_COUNT] =3D {') =20 for e in events: - out(' { .id =3D %(id)s, .name =3D \"%(name)s\", .sstate =3D %= (sstate)s, .dstate =3D 0 },', + if "vcpu" in e.properties and "tcg-trans" in e.properties: + vcpu_id =3D "TRACE_CPU_" + e.name.upper() + else: + vcpu_id =3D "TRACE_CPU_EVENT_COUNT" + out(' { .id =3D %(id)s, .cpu_id =3D %(vcpu_id)s,' + ' .name =3D \"%(name)s\",' + ' .sstate =3D %(sstate)s, .dstate =3D 0 },', id =3D "TRACE_" + e.name.upper(), + vcpu_id =3D vcpu_id, name =3D e.name, sstate =3D "TRACE_%s_ENABLED" % e.name.upper()) =20 diff --git a/scripts/tracetool/format/events_h.py b/scripts/tracetool/for= mat/events_h.py index 9f114a3..e89e4ab 100644 --- a/scripts/tracetool/format/events_h.py +++ b/scripts/tracetool/format/events_h.py @@ -6,7 +6,7 @@ trace/generated-events.h """ =20 __author__ =3D "Llu=C3=ADs Vilanova " -__copyright__ =3D "Copyright 2012-2014, Llu=C3=ADs Vilanova " +__copyright__ =3D "Copyright 2012-2015, Llu=C3=ADs Vilanova " __license__ =3D "GPL version 2 or (at your option) any later version" =20 __maintainer__ =3D "Stefan Hajnoczi" @@ -34,6 +34,16 @@ def generate(events, backend): out(' TRACE_EVENT_COUNT', '} TraceEventID;') =20 + # per-vCPU event identifiers + out('typedef enum {') + + for e in events: + if "vcpu" in e.properties and "tcg-trans" in e.properties: + out(' TRACE_CPU_%s,' % e.name.upper()) + + out(' TRACE_CPU_EVENT_COUNT', + '} TraceEventCPUID;') + # static state for e in events: if 'disable' in e.properties: diff --git a/trace/control-internal.h b/trace/control-internal.h index 5a8df28..70e55df 100644 --- a/trace/control-internal.h +++ b/trace/control-internal.h @@ -1,7 +1,7 @@ /* * Interface for configuring and controlling the state of tracing events. * - * Copyright (C) 2011-2014 Llu=C3=ADs Vilanova + * Copyright (C) 2011-2015 Llu=C3=ADs Vilanova * * This work is licensed under the terms of the GNU GPL, version 2 or la= ter. * See the COPYING file in the top-level directory. @@ -39,6 +39,12 @@ static inline TraceEventID trace_event_get_id(TraceEve= nt *ev) return ev->id; } =20 +static inline TraceEventCPUID trace_event_get_cpu_id(TraceEvent *ev) +{ + assert(ev !=3D NULL); + return ev->cpu_id; +} + static inline const char * trace_event_get_name(TraceEvent *ev) { assert(ev !=3D NULL); diff --git a/trace/control.h b/trace/control.h index 1a78a7b..c0680c7 100644 --- a/trace/control.h +++ b/trace/control.h @@ -89,6 +89,13 @@ static TraceEventID trace_event_count(void); static TraceEventID trace_event_get_id(TraceEvent *ev); =20 /** + * trace_event_get_cpu_id: + * + * Get the per-vCPU identifier of an event. + */ +static TraceEventCPUID trace_event_get_cpu_id(TraceEvent *ev); + +/** * trace_event_get_name: * * Get the name of an event. diff --git a/trace/event-internal.h b/trace/event-internal.h index b2310d9..ae18b48 100644 --- a/trace/event-internal.h +++ b/trace/event-internal.h @@ -1,7 +1,7 @@ /* * Interface for configuring and controlling the state of tracing events. * - * Copyright (C) 2012 Llu=C3=ADs Vilanova + * Copyright (C) 2012-2015 Llu=C3=ADs Vilanova * * This work is licensed under the terms of the GNU GPL, version 2 or la= ter. * See the COPYING file in the top-level directory. @@ -16,6 +16,7 @@ /** * TraceEvent: * @id: Unique event identifier. + * @cpu_id: Unique per-vCPU event identifier. * @name: Event name. * @sstate: Static tracing state. * @dstate: Dynamic tracing state. @@ -24,6 +25,7 @@ */ typedef struct TraceEvent { TraceEventID id; + TraceEventCPUID cpu_id; const char * name; const bool sstate; bool dstate; diff --git a/trace/qmp.c b/trace/qmp.c index 0b19489..a669698 100644 --- a/trace/qmp.c +++ b/trace/qmp.c @@ -22,6 +22,8 @@ TraceEventInfoList *qmp_trace_event_get_state(const cha= r *name, Error **errp) while ((ev =3D trace_event_pattern(name, ev)) !=3D NULL) { TraceEventInfoList *elem =3D g_new(TraceEventInfoList, 1); elem->value =3D g_new(TraceEventInfo, 1); + elem->value->vcpu =3D + trace_event_get_cpu_id(ev) =3D=3D TRACE_CPU_EVENT_COUNT ? fa= lse : true; elem->value->name =3D g_strdup(trace_event_get_name(ev)); if (!trace_event_get_state_static(ev)) { elem->value->state =3D TRACE_EVENT_STATE_UNAVAILABLE;