From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33445) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WtztL-0006gC-Rb for qemu-devel@nongnu.org; Mon, 09 Jun 2014 09:45:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WtztG-00043f-Ri for qemu-devel@nongnu.org; Mon, 09 Jun 2014 09:45:39 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38511) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WtztG-00043J-CN for qemu-devel@nongnu.org; Mon, 09 Jun 2014 09:45:34 -0400 From: Stefan Hajnoczi Date: Mon, 9 Jun 2014 15:45:10 +0200 Message-Id: <1402321522-18408-3-git-send-email-stefanha@redhat.com> In-Reply-To: <1402321522-18408-1-git-send-email-stefanha@redhat.com> References: <1402321522-18408-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 1/9] trace: [tracetool] Add method 'Event.api' to build event names 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 Makes it easier to ensure proper naming across the different frontends an= d backends. Signed-off-by: Llu=C3=ADs Vilanova Signed-off-by: Stefan Hajnoczi --- scripts/tracetool/__init__.py | 10 +++++++++- scripts/tracetool/backend/dtrace.py | 6 +++--- scripts/tracetool/backend/simple.py | 10 +++++----- scripts/tracetool/backend/stderr.py | 5 +++-- scripts/tracetool/backend/ust.py | 7 ++++--- scripts/tracetool/format/h.py | 6 +++--- 6 files changed, 27 insertions(+), 17 deletions(-) diff --git a/scripts/tracetool/__init__.py b/scripts/tracetool/__init__.p= y index 175df08..305b99e 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, Llu=C3=ADs Vilanova " +__copyright__ =3D "Copyright 2012-2014, Llu=C3=ADs Vilanova " __license__ =3D "GPL version 2 or (at your option) any later version" =20 __maintainer__ =3D "Stefan Hajnoczi" @@ -173,6 +173,14 @@ class Event(object): self.args, self.fmt) =20 + QEMU_TRACE =3D "trace_%(name)s" + + def api(self, fmt=3DNone): + if fmt is None: + fmt =3D Event.QEMU_TRACE + return fmt % {"name": self.name} + + def _read_events(fobj): res =3D [] for line in fobj: diff --git a/scripts/tracetool/backend/dtrace.py b/scripts/tracetool/back= end/dtrace.py index e31bc79..3c369c4 100644 --- a/scripts/tracetool/backend/dtrace.py +++ b/scripts/tracetool/backend/dtrace.py @@ -6,7 +6,7 @@ DTrace/SystemTAP backend. """ =20 __author__ =3D "Llu=C3=ADs Vilanova " -__copyright__ =3D "Copyright 2012, Llu=C3=ADs Vilanova " +__copyright__ =3D "Copyright 2012-2014, Llu=C3=ADs Vilanova " __license__ =3D "GPL version 2 or (at your option) any later version" =20 __maintainer__ =3D "Stefan Hajnoczi" @@ -44,10 +44,10 @@ def h(events): '') =20 for e in events: - out('static inline void trace_%(name)s(%(args)s) {', + out('static inline void %(api)s(%(args)s) {', ' QEMU_%(uppername)s(%(argnames)s);', '}', - name =3D e.name, + api =3D e.api(), args =3D e.args, uppername =3D e.name.upper(), argnames =3D ", ".join(e.args.names()), diff --git a/scripts/tracetool/backend/simple.py b/scripts/tracetool/back= end/simple.py index 3dde372..ca48e12 100644 --- a/scripts/tracetool/backend/simple.py +++ b/scripts/tracetool/backend/simple.py @@ -6,7 +6,7 @@ Simple built-in backend. """ =20 __author__ =3D "Llu=C3=ADs Vilanova " -__copyright__ =3D "Copyright 2012, Llu=C3=ADs Vilanova " +__copyright__ =3D "Copyright 2012-2014, Llu=C3=ADs Vilanova " __license__ =3D "GPL version 2 or (at your option) any later version" =20 __maintainer__ =3D "Stefan Hajnoczi" @@ -34,10 +34,10 @@ def c(events): ) =20 for num, event in enumerate(events): - out('void trace_%(name)s(%(args)s)', + out('void %(api)s(%(args)s)', '{', ' TraceBufferRecord rec;', - name =3D event.name, + api =3D event.api(), args =3D event.args, ) sizes =3D [] @@ -95,7 +95,7 @@ def c(events): =20 def h(events): for event in events: - out('void trace_%(name)s(%(args)s);', - name =3D event.name, + out('void %(api)s(%(args)s);', + api =3D event.api(), args =3D event.args, ) diff --git a/scripts/tracetool/backend/stderr.py b/scripts/tracetool/back= end/stderr.py index 6f93dbd..6681e26 100644 --- a/scripts/tracetool/backend/stderr.py +++ b/scripts/tracetool/backend/stderr.py @@ -6,7 +6,7 @@ Stderr built-in backend. """ =20 __author__ =3D "Llu=C3=ADs Vilanova " -__copyright__ =3D "Copyright 2012, Llu=C3=ADs Vilanova " +__copyright__ =3D "Copyright 2012-2014, Llu=C3=ADs Vilanova " __license__ =3D "GPL version 2 or (at your option) any later version" =20 __maintainer__ =3D "Stefan Hajnoczi" @@ -33,13 +33,14 @@ def h(events): if len(e.args) > 0: argnames =3D ", " + argnames =20 - out('static inline void trace_%(name)s(%(args)s)', + out('static inline void %(api)s(%(args)s)', '{', ' bool _state =3D trace_event_get_state(%(event_id)s);', ' if (_state) {', ' fprintf(stderr, "%(name)s " %(fmt)s "\\n" %(argname= s)s);', ' }', '}', + api =3D e.api(), name =3D e.name, args =3D e.args, event_id =3D "TRACE_" + e.name.upper(), diff --git a/scripts/tracetool/backend/ust.py b/scripts/tracetool/backend= /ust.py index 41c1c75..2fca4d2 100644 --- a/scripts/tracetool/backend/ust.py +++ b/scripts/tracetool/backend/ust.py @@ -6,7 +6,7 @@ LTTng User Space Tracing backend. """ =20 __author__ =3D "Llu=C3=ADs Vilanova " -__copyright__ =3D "Copyright 2012, Llu=C3=ADs Vilanova " +__copyright__ =3D "Copyright 2012-2014, Llu=C3=ADs Vilanova " __license__ =3D "GPL version 2 or (at your option) any later version" =20 __maintainer__ =3D "Stefan Hajnoczi" @@ -31,11 +31,12 @@ def h(events): if len(e.args) > 0: argnames =3D ", " + argnames =20 - out('static inline void trace_%(name)s(%(args)s)', + out('static inline void %(api)s(%(args)s)', '{', ' tracepoint(qemu, %(name)s%(tp_args)s);', '}', '', + api =3D e.api() name =3D e.name, args =3D e.args, tp_args =3D argnames, @@ -79,4 +80,4 @@ def ust_events_h(events): ')', '', name =3D e.name, - ) \ No newline at end of file + ) diff --git a/scripts/tracetool/format/h.py b/scripts/tracetool/format/h.p= y index 93132fc..9b0903d 100644 --- a/scripts/tracetool/format/h.py +++ b/scripts/tracetool/format/h.py @@ -6,7 +6,7 @@ Generate .h file. """ =20 __author__ =3D "Llu=C3=ADs Vilanova " -__copyright__ =3D "Copyright 2012, Llu=C3=ADs Vilanova " +__copyright__ =3D "Copyright 2012-2014, Llu=C3=ADs Vilanova " __license__ =3D "GPL version 2 or (at your option) any later version" =20 __maintainer__ =3D "Stefan Hajnoczi" @@ -30,9 +30,9 @@ def end(events): def nop(events): for e in events: out('', - 'static inline void trace_%(name)s(%(args)s)', + 'static inline void %(api)s(%(args)s)', '{', '}', - name =3D e.name, + api =3D e.api(), args =3D e.args, ) --=20 1.9.0