From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55249) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bmzZP-0001tO-Lx for qemu-devel@nongnu.org; Thu, 22 Sep 2016 04:41:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bmzZL-000761-3p for qemu-devel@nongnu.org; Thu, 22 Sep 2016 04:41:27 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48076) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bmzZK-00075r-Tn for qemu-devel@nongnu.org; Thu, 22 Sep 2016 04:41:23 -0400 From: "Daniel P. Berrange" Date: Thu, 22 Sep 2016 09:40:51 +0100 Message-Id: <1474533652-31170-17-git-send-email-berrange@redhat.com> In-Reply-To: <1474533652-31170-1-git-send-email-berrange@redhat.com> References: <1474533652-31170-1-git-send-email-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v4 16/17] trace: push reading of events up a level to tracetool main List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Llu=C3=ADs=20Vilanova?= , Eric Blake , Stefan Hajnoczi , "Daniel P. Berrange" Move the reading of events out of the 'tracetool.generate' method and into tracetool.main, so that the latter is not tied to generating from a single source of events. Reviewed-by: Llu=C3=ADs Vilanova Signed-off-by: Daniel P. Berrange --- scripts/tracetool.py | 4 +++- scripts/tracetool/__init__.py | 8 +++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/tracetool.py b/scripts/tracetool.py index 7b82959..6accbbf 100755 --- a/scripts/tracetool.py +++ b/scripts/tracetool.py @@ -129,8 +129,10 @@ def main(args): if probe_prefix is None: probe_prefix =3D ".".join(["qemu", target_type, target_name]= ) =20 + events =3D tracetool.read_events(sys.stdin) + try: - tracetool.generate(sys.stdin, arg_format, arg_backends, + tracetool.generate(events, arg_format, arg_backends, binary=3Dbinary, probe_prefix=3Dprobe_prefix) except tracetool.TracetoolError as e: error_opt(str(e)) diff --git a/scripts/tracetool/__init__.py b/scripts/tracetool/__init__.p= y index 136f716..d9cf12a 100644 --- a/scripts/tracetool/__init__.py +++ b/scripts/tracetool/__init__.py @@ -364,14 +364,14 @@ def try_import(mod_name, attr_name=3DNone, attr_def= ault=3DNone): return False, None =20 =20 -def generate(fevents, format, backends, +def generate(events, format, backends, binary=3DNone, probe_prefix=3DNone): """Generate the output for the given (format, backends) pair. =20 Parameters ---------- - fevents : file - Event description file. + events : list + list of Event objects to generate for format : str Output format name. backends : list @@ -401,6 +401,4 @@ def generate(fevents, format, backends, tracetool.backend.dtrace.BINARY =3D binary tracetool.backend.dtrace.PROBEPREFIX =3D probe_prefix =20 - events =3D read_events(fevents) - tracetool.format.generate(events, format, backend) --=20 2.7.4