[PULL,07/13] trace: Remove unnecessary intermediate event copies

Commit Message

Stefan Hajnoczi March 1, 2016, 3:48 p.m. UTC

From: Lluís Vilanova <[e-mail]>

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

Signed-off-by: Lluís Vilanova <[e-mail]>
Message-id: 145641858988.30295.7223459456488075843.stgit@localhost
Signed-off-by: Stefan Hajnoczi <[e-mail]>
---
 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(-)

Patch

diff --git a/scripts/tracetool/__init__.py b/scripts/tracetool/__init__.py
index 0663e7f..26878f4 100644
--- a/scripts/tracetool/__init__.py
+++ b/scripts/tracetool/__init__.py
@@ -6,7 +6,7 @@  Machinery for generating tracing-related intermediate files.
 """
 
 __author__     = "Lluís Vilanova <[e-mail]>"
-__copyright__  = "Copyright 2012-2014, Lluís Vilanova <[e-mail]>"
+__copyright__  = "Copyright 2012-2016, Lluís Vilanova <[e-mail]>"
 __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
diff --git a/scripts/tracetool/format/events_h.py b/scripts/tracetool/format/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
 """
 
 __author__     = "Lluís Vilanova <[e-mail]>"
-__copyright__  = "Copyright 2012-2014, Lluís Vilanova <[e-mail]>"
+__copyright__  = "Copyright 2012-2016, Lluís Vilanova <[e-mail]>"
 __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))
 
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.
 """
 
 __author__     = "Lluís Vilanova <[e-mail]>"
-__copyright__  = "Copyright 2012-2014, Lluís Vilanova <[e-mail]>"
+__copyright__  = "Copyright 2012-2016, Lluís Vilanova <[e-mail]>"
 __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)',
             '{',