From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40194) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XHCHf-000139-TE for qemu-devel@nongnu.org; Tue, 12 Aug 2014 09:38:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XHCHb-000894-2h for qemu-devel@nongnu.org; Tue, 12 Aug 2014 09:38:39 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47387) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XHCHa-00088r-RM for qemu-devel@nongnu.org; Tue, 12 Aug 2014 09:38:34 -0400 From: Stefan Hajnoczi Date: Tue, 12 Aug 2014 14:37:53 +0100 Message-Id: <1407850675-11890-17-git-send-email-stefanha@redhat.com> In-Reply-To: <1407850675-11890-1-git-send-email-stefanha@redhat.com> References: <1407850675-11890-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 16/18] trace: teach lttng backend to use format strings List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Stefan Hajnoczi From: Alex Benn=C3=A9e This makes the UST backend pay attention to the format string arguments that are defined when defining payload data. With this you can now ensure integers are reported in hex mode if you want. Signed-off-by: Alex Benn=C3=A9e Signed-off-by: Stefan Hajnoczi --- scripts/tracetool/__init__.py | 12 ++++++++++-- scripts/tracetool/format/ust_events_h.py | 15 +++++++++++---- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/scripts/tracetool/__init__.py b/scripts/tracetool/__init__.p= y index a51e0f2..36c789d 100644 --- a/scripts/tracetool/__init__.py +++ b/scripts/tracetool/__init__.py @@ -136,6 +136,8 @@ class Event(object): Properties of the event. args : Arguments The event arguments. + arg_fmts : str + The format strings for each argument. """ =20 _CRE =3D re.compile("((?P.*)\s+)?" @@ -144,10 +146,11 @@ class Event(object): "\s*" "(?:(?:(?P\".+),)?\s*(?P\".+))?" "\s*") + _FMT =3D re.compile("(%\w+|%.*PRI\S+)") =20 _VALID_PROPS =3D set(["disable", "tcg", "tcg-trans", "tcg-exec"]) =20 - def __init__(self, name, props, fmt, args, orig=3DNone): + def __init__(self, name, props, fmt, args, arg_fmts, orig=3DNone): """ Parameters ---------- @@ -159,13 +162,17 @@ class Event(object): Event printing format (or formats). args : Arguments Event arguments. + arg_fmts : list of str + Format strings for each argument. orig : Event or None Original Event before transformation. + """ self.name =3D name self.properties =3D props self.fmt =3D fmt self.args =3D args + self.arg_fmts =3D arg_fmts =20 if orig is None: self.original =3D weakref.ref(self) @@ -203,6 +210,7 @@ class Event(object): if len(fmt_trans) > 0: fmt =3D [fmt_trans, fmt] args =3D Arguments.build(groups["args"]) + arg_fmts =3D Event._FMT.findall(fmt) =20 if "tcg-trans" in props: raise ValueError("Invalid property 'tcg-trans'") @@ -213,7 +221,7 @@ class Event(object): if "tcg" in props and isinstance(fmt, str): raise ValueError("Events with 'tcg' property must have two f= ormats") =20 - return Event(name, props, fmt, args) + return Event(name, props, fmt, args, arg_fmts) =20 def __repr__(self): """Evaluable string representation for this object.""" diff --git a/scripts/tracetool/format/ust_events_h.py b/scripts/tracetool= /format/ust_events_h.py index 5102565..d189899 100644 --- a/scripts/tracetool/format/ust_events_h.py +++ b/scripts/tracetool/format/ust_events_h.py @@ -63,13 +63,20 @@ def generate(events, backend): name=3De.name, args=3D", ".join(", ".join(i) for i in e.args)) =20 - for t, n in e.args: - if ('int' in t) or ('long' in t) or ('unsigned' in t) or= ('size_t' in t): + types =3D e.args.types() + names =3D e.args.names() + fmts =3D e.arg_fmts + for t,n,f in zip(types, names, fmts): + if ('char *' in t) or ('char*' in t): + out(' ctf_string(' + n + ', ' + n + ')') + elif ("%p" in f) or ("x" in f) or ("PRIx" in f): + out(' ctf_integer_hex('+ t + ', ' + n + ', ' += n + ')') + elif ("ptr" in t) or ("*" in t): + out(' ctf_integer_hex('+ t + ', ' + n + ', ' += n + ')') + elif ('int' in t) or ('long' in t) or ('unsigned' in t) = or ('size_t' in t): out(' ctf_integer(' + t + ', ' + n + ', ' + n = + ')') elif ('double' in t) or ('float' in t): out(' ctf_float(' + t + ', ' + n + ', ' + n + = ')') - elif ('char *' in t) or ('char*' in t): - out(' ctf_string(' + n + ', ' + n + ')') elif ('void *' in t) or ('void*' in t): out(' ctf_integer_hex(unsigned long, ' + n + '= , ' + n + ')') =20 --=20 1.9.3