Commit 56797b1f authored by Lluís Vilanova's avatar Lluís Vilanova Committed by Stefan Hajnoczi
Browse files

trace: Remove unnecessary intermediate event copies 



The current code forces the use of a chain of ".original" dereferences,
which looks odd.

Signed-off-by: default avatarLluís Vilanova <vilanova@ac.upc.edu>
Message-id: 145641858988.30295.7223459456488075843.stgit@localhost
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent 3596f524

scripts/tracetool/__init__.py

+2 −3
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ Machinery for generating tracing-related intermediate files. 
"""



__author__     = "Lluís Vilanova <vilanova@ac.upc.edu>"

__copyright__  = "Copyright 2012-2014, Lluís Vilanova <vilanova@ac.upc.edu>"

__copyright__  = "Copyright 2012-2016, Lluís Vilanova <vilanova@ac.upc.edu>"

__license__    = "GPL version 2 or (at your option) any later version"



__maintainer__ = "Stefan Hajnoczi"
@@ -288,13 +288,12 @@ def _read_events(fobj): 
                if atrans == aorig:

                    args_trans.append(atrans)

            event_trans.args = Arguments(args_trans)

            event_trans = event_trans.copy()



            event_exec = event.copy()

            event_exec.name += "_exec"

            event_exec.properties += ["tcg-exec"]

            event_exec.fmt = event.fmt[1]

            event_exec = event_exec.transform(tracetool.transform.TCG_2_HOST)

            event_exec.args = event_exec.args.transform(tracetool.transform.TCG_2_HOST)



            new_event = [event_trans, event_exec]

            event.event_trans, event.event_exec = new_event

scripts/tracetool/format/events_h.py

+2 −2
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ trace/generated-events.h 
"""



__author__     = "Lluís Vilanova <vilanova@ac.upc.edu>"

__copyright__  = "Copyright 2012-2014, Lluís Vilanova <vilanova@ac.upc.edu>"

__copyright__  = "Copyright 2012-2016, Lluís Vilanova <vilanova@ac.upc.edu>"

__license__    = "GPL version 2 or (at your option) any later version"



__maintainer__ = "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=e.original.original.name.upper(),

                name=e.original.name.upper(),

                enabled=enabled)

        out('#define TRACE_%s_ENABLED %d' % (e.name.upper(), enabled))

scripts/tracetool/format/tcg_h.py

+2 −2
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ Generate .h file for TCG code generation. 
"""



__author__     = "Lluís Vilanova <vilanova@ac.upc.edu>"

__copyright__  = "Copyright 2012-2014, Lluís Vilanova <vilanova@ac.upc.edu>"

__copyright__  = "Copyright 2012-2016, Lluís Vilanova <vilanova@ac.upc.edu>"

__license__    = "GPL version 2 or (at your option) any later version"



__maintainer__ = "Stefan Hajnoczi"
@@ -36,7 +36,7 @@ def generate(events, backend): 
            continue



        # get the original event definition

        e = e.original.original

        e = e.original



        out('static inline void %(name_tcg)s(%(args)s)',

            '{',