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

trace: [tcg] Add 'tcg' event property 



Transforms event:

  tcg name(...) "...", "..."

into two internal events:

  tcg-trans name_trans(...) "..."
  tcg-exec name_exec(...) "..."

Signed-off-by: default avatarLluís Vilanova <vilanova@ac.upc.edu>
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent b55835ac

scripts/tracetool/__init__.py

+59 −5
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ import weakref 


import tracetool.format

import tracetool.backend

import tracetool.transform





def error_write(*lines):
@@ -137,9 +138,14 @@ class Event(object): 
        The event arguments.

    """



    _CRE = re.compile("((?P<props>.*)\s+)?(?P<name>[^(\s]+)\((?P<args>[^)]*)\)\s*(?P<fmt>\".*)?")

    _CRE = re.compile("((?P<props>.*)\s+)?"

                      "(?P<name>[^(\s]+)"

                      "\((?P<args>[^)]*)\)"

                      "\s*"

                      "(?:(?:(?P<fmt_trans>\".+),)?\s*(?P<fmt>\".+))?"

                      "\s*")



    _VALID_PROPS = set(["disable"])

    _VALID_PROPS = set(["disable", "tcg", "tcg-trans", "tcg-exec"])



    def __init__(self, name, props, fmt, args, orig=None):

        """
@@ -149,8 +155,8 @@ class Event(object): 
            Event name.

        props : list of str

            Property names.

        fmt : str

            Event printing format.

        fmt : str, list of str

            Event printing format (or formats).

        args : Arguments

            Event arguments.

        orig : Event or None
@@ -170,6 +176,7 @@ class Event(object): 
        if len(unknown_props) > 0:

            raise ValueError("Unknown properties: %s"

                             % ", ".join(unknown_props))

        assert isinstance(self.fmt, str) or len(self.fmt) == 2



    def copy(self):

        """Create a new copy."""
@@ -192,16 +199,32 @@ class Event(object): 
        name = groups["name"]

        props = groups["props"].split()

        fmt = groups["fmt"]

        fmt_trans = groups["fmt_trans"]

        if len(fmt_trans) > 0:

            fmt = [fmt_trans, fmt]

        args = Arguments.build(groups["args"])



        if "tcg-trans" in props:

            raise ValueError("Invalid property 'tcg-trans'")

        if "tcg-exec" in props:

            raise ValueError("Invalid property 'tcg-exec'")

        if "tcg" not in props and not isinstance(fmt, str):

            raise ValueError("Only events with 'tcg' property can have two formats")

        if "tcg" in props and isinstance(fmt, str):

            raise ValueError("Events with 'tcg' property must have two formats")



        return Event(name, props, fmt, args)



    def __repr__(self):

        """Evaluable string representation for this object."""

        if isinstance(self.fmt, str):

            fmt = self.fmt

        else:

            fmt = "%s, %s" % (self.fmt[0], self.fmt[1])

        return "Event('%s %s(%s) %s')" % (" ".join(self.properties),

                                          self.name,

                                          self.args,

                                          self.fmt)

                                          fmt)



    QEMU_TRACE               = "trace_%(name)s"
@@ -300,4 +323,35 @@ def generate(fevents, format, backends, 


    events = _read_events(fevents)



    # transform TCG-enabled events

    new_events = []

    for event in events:

        if "tcg" not in event.properties:

            new_events.append(event)

        else:

            event_trans = event.copy()

            event_trans.name += "_trans"

            event_trans.properties += ["tcg-trans"]

            event_trans.fmt = event.fmt[0]

            args_trans = []

            for atrans, aorig in zip(

                    event_trans.transform(tracetool.transform.TCG_2_HOST).args,

                    event.args):

                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)



            new_event = [event_trans, event_exec]

            event.event_trans, event.event_exec = new_event



            new_events.extend(new_event)

    events = new_events



    tracetool.format.generate(events, format, backend)

scripts/tracetool/format/events_h.py

+5 −0
Original line number Diff line number Diff line
@@ -40,6 +40,11 @@ def generate(events, backend): 
            enabled = 0

        else:

            enabled = 1

        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(),

                enabled=enabled)

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



    out('#include "trace/event-internal.h"',