From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51809) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XqP4c-00040K-FG for qemu-devel@nongnu.org; Mon, 17 Nov 2014 11:22:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XqP4X-0006CE-Sf for qemu-devel@nongnu.org; Mon, 17 Nov 2014 11:22:42 -0500 Received: from mail-wi0-x22f.google.com ([2a00:1450:400c:c05::22f]:46346) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XqP4X-0006B0-F5 for qemu-devel@nongnu.org; Mon, 17 Nov 2014 11:22:37 -0500 Received: by mail-wi0-f175.google.com with SMTP id l15so6291442wiw.8 for ; Mon, 17 Nov 2014 08:22:36 -0800 (PST) Date: Mon, 17 Nov 2014 16:22:34 +0000 From: Stefan Hajnoczi Message-ID: <20141117162234.GJ16192@stefanha-thinkpad.redhat.com> References: <1414964279-25288-1-git-send-email-christoph.seifert@posteo.de> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="ofZMSlrAVk9bLeVm" Content-Disposition: inline In-Reply-To: <1414964279-25288-1-git-send-email-christoph.seifert@posteo.de> Subject: Re: [Qemu-devel] [PATCH] Tracing: Fix simpletrace.py error on tcg enabled binary traces List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: christoph.seifert@posteo.de Cc: qemu-devel@nongnu.org, stefanha@redhat.com, =?iso-8859-1?Q?Llu=EDs?= Vilanova --ofZMSlrAVk9bLeVm Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Nov 02, 2014 at 10:37:59PM +0100, christoph.seifert@posteo.de wrote: > From: Christoph Seifert >=20 > simpletrace.py does not recognize the tcg option while reading trace-even= ts file. In result simpletrace does not work on binary traces and tcg enab= led events. Moved transformation of tcg enabled events to _read_events() wh= ich is used by simpletrace. >=20 > Signed-off-by: Christoph Seifert > --- > scripts/tracetool/__init__.py | 67 +++++++++++++++++++++----------------= ------ > 1 file changed, 33 insertions(+), 34 deletions(-) Looks good to me. Llu=EDs: Any comments? > diff --git a/scripts/tracetool/__init__.py b/scripts/tracetool/__init__.py > index 3d5743f..181675f 100644 > --- a/scripts/tracetool/__init__.py > +++ b/scripts/tracetool/__init__.py > @@ -253,14 +253,44 @@ class Event(object): > =20 > =20 > def _read_events(fobj): > - res =3D [] > + events =3D [] > for line in fobj: > if not line.strip(): > continue > if line.lstrip().startswith('#'): > continue > - res.append(Event.build(line)) > - return res > + > + event =3D Event.build(line) > + > + # transform TCG-enabled events > + if "tcg" not in event.properties: > + events.append(event) > + else: > + event_trans =3D event.copy() > + event_trans.name +=3D "_trans" > + event_trans.properties +=3D ["tcg-trans"] > + event_trans.fmt =3D event.fmt[0] > + args_trans =3D [] > + for atrans, aorig in zip( > + event_trans.transform(tracetool.transform.TCG_2_HOST= ).args, > + event.args): > + if atrans =3D=3D aorig: > + args_trans.append(atrans) > + event_trans.args =3D Arguments(args_trans) > + event_trans =3D event_trans.copy() > + > + event_exec =3D event.copy() > + event_exec.name +=3D "_exec" > + event_exec.properties +=3D ["tcg-exec"] > + event_exec.fmt =3D event.fmt[1] > + event_exec =3D event_exec.transform(tracetool.transform.TCG_= 2_HOST) > + > + new_event =3D [event_trans, event_exec] > + event.event_trans, event.event_exec =3D new_event > + > + events.extend(new_event) > + > + return events > =20 > =20 > class TracetoolError (Exception): > @@ -333,35 +363,4 @@ def generate(fevents, format, backends, > =20 > events =3D _read_events(fevents) > =20 > - # transform TCG-enabled events > - new_events =3D [] > - for event in events: > - if "tcg" not in event.properties: > - new_events.append(event) > - else: > - event_trans =3D event.copy() > - event_trans.name +=3D "_trans" > - event_trans.properties +=3D ["tcg-trans"] > - event_trans.fmt =3D event.fmt[0] > - args_trans =3D [] > - for atrans, aorig in zip( > - event_trans.transform(tracetool.transform.TCG_2_HOST= ).args, > - event.args): > - if atrans =3D=3D aorig: > - args_trans.append(atrans) > - event_trans.args =3D Arguments(args_trans) > - event_trans =3D event_trans.copy() > - > - event_exec =3D event.copy() > - event_exec.name +=3D "_exec" > - event_exec.properties +=3D ["tcg-exec"] > - event_exec.fmt =3D event.fmt[1] > - event_exec =3D event_exec.transform(tracetool.transform.TCG_= 2_HOST) > - > - new_event =3D [event_trans, event_exec] > - event.event_trans, event.event_exec =3D new_event > - > - new_events.extend(new_event) > - events =3D new_events > - > tracetool.format.generate(events, format, backend) > --=20 > 2.1.3 >=20 >=20 --ofZMSlrAVk9bLeVm Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAEBAgAGBQJUaiDKAAoJEJykq7OBq3PIjjUIALwahuyJx1lcC+ED4jjYPCwH bDLP6V29P8cOq2DnEqHsaLD1sc5NC2Tco3k81T8dRnz0wqY/Ov5Fb3KrpBX1+Txk 6NjELAxiGEWqSDELcFtAM2Sjx3+hp8ibkbx3Nh96jyilcSaY0x++K5pJZ6+svpyl BoFrsTSSGIQYYETvb/NTbWDgGSGFNlVnRw3R40Rt+0n2S7lqdvaKUmDf7M821EeT WlHiZYJnKUaisOZUj5J5h4duvV8zDdBu65sH4fhAaaoSXK13Srm7GyUaHR4mttLy 8wELXQG+0YubiwYZUSPLX9ruXow4QPsFWpf13H4UPT1xMravvOtDPCxMZ+cvxKs= =c35V -----END PGP SIGNATURE----- --ofZMSlrAVk9bLeVm--