From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39300) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aamXJ-0006vJ-S0 for qemu-devel@nongnu.org; Tue, 01 Mar 2016 10:48:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aamXI-00038h-Qs for qemu-devel@nongnu.org; Tue, 01 Mar 2016 10:48:33 -0500 Received: from mx1.redhat.com ([209.132.183.28]:56554) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aamXI-00038Z-JO for qemu-devel@nongnu.org; Tue, 01 Mar 2016 10:48:32 -0500 From: Stefan Hajnoczi Date: Tue, 1 Mar 2016 15:48:08 +0000 Message-Id: <1456847294-13576-8-git-send-email-stefanha@redhat.com> In-Reply-To: <1456847294-13576-1-git-send-email-stefanha@redhat.com> References: <1456847294-13576-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 07/13] trace: Remove unnecessary intermediate event copies List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , =?UTF-8?q?Llu=C3=ADs=20Vilanova?= , Stefan Hajnoczi From: Llu=C3=ADs Vilanova The current code forces the use of a chain of ".original" dereferences, which looks odd. Signed-off-by: Llu=C3=ADs Vilanova Message-id: 145641858988.30295.7223459456488075843.stgit@localhost Signed-off-by: Stefan Hajnoczi --- scripts/tracetool/__init__.py | 5 ++--- scripts/tracetool/format/events_h.py | 4 ++-- scripts/tracetool/format/tcg_h.py | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/scripts/tracetool/__init__.py b/scripts/tracetool/__init__.p= y index 0663e7f..26878f4 100644 --- a/scripts/tracetool/__init__.py +++ b/scripts/tracetool/__init__.py @@ -6,7 +6,7 @@ Machinery for generating tracing-related intermediate fil= es. """ =20 __author__ =3D "Llu=C3=ADs Vilanova " -__copyright__ =3D "Copyright 2012-2014, Llu=C3=ADs Vilanova " +__copyright__ =3D "Copyright 2012-2016, Llu=C3=ADs Vilanova " __license__ =3D "GPL version 2 or (at your option) any later version" =20 __maintainer__ =3D "Stefan Hajnoczi" @@ -288,13 +288,12 @@ def _read_events(fobj): if atrans =3D=3D aorig: args_trans.append(atrans) event_trans.args =3D Arguments(args_trans) - event_trans =3D event_trans.copy() =20 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) + event_exec.args =3D event_exec.args.transform(tracetool.tran= sform.TCG_2_HOST) =20 new_event =3D [event_trans, event_exec] event.event_trans, event.event_exec =3D new_event diff --git a/scripts/tracetool/format/events_h.py b/scripts/tracetool/for= mat/events_h.py index 9f114a3..bbfaa5b 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-2016, Llu=C3=ADs Vilanova " __license__ =3D "GPL version 2 or (at your option) any later version" =20 __maintainer__ =3D "Stefan Hajnoczi" @@ -43,7 +43,7 @@ def generate(events, backend): if "tcg-trans" in e.properties: # a single define for the two "sub-events" out('#define TRACE_%(name)s_ENABLED %(enabled)d', - name=3De.original.original.name.upper(), + name=3De.original.name.upper(), enabled=3Denabled) out('#define TRACE_%s_ENABLED %d' % (e.name.upper(), enabled)) =20 diff --git a/scripts/tracetool/format/tcg_h.py b/scripts/tracetool/format= /tcg_h.py index f676b66..0d2cf79 100644 --- a/scripts/tracetool/format/tcg_h.py +++ b/scripts/tracetool/format/tcg_h.py @@ -6,7 +6,7 @@ Generate .h file for TCG code generation. """ =20 __author__ =3D "Llu=C3=ADs Vilanova " -__copyright__ =3D "Copyright 2012-2014, Llu=C3=ADs Vilanova " +__copyright__ =3D "Copyright 2012-2016, Llu=C3=ADs Vilanova " __license__ =3D "GPL version 2 or (at your option) any later version" =20 __maintainer__ =3D "Stefan Hajnoczi" @@ -36,7 +36,7 @@ def generate(events, backend): continue =20 # get the original event definition - e =3D e.original.original + e =3D e.original =20 out('static inline void %(name_tcg)s(%(args)s)', '{', --=20 2.5.0