From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44358) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1brPtm-0004u9-RJ for qemu-devel@nongnu.org; Tue, 04 Oct 2016 09:36:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1brPti-0004Ve-Bu for qemu-devel@nongnu.org; Tue, 04 Oct 2016 09:36:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43870) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1brPti-0004VA-4Z for qemu-devel@nongnu.org; Tue, 04 Oct 2016 09:36:42 -0400 From: "Daniel P. Berrange" Date: Tue, 4 Oct 2016 14:35:56 +0100 Message-Id: <1475588159-30598-18-git-send-email-berrange@redhat.com> In-Reply-To: <1475588159-30598-1-git-send-email-berrange@redhat.com> References: <1475588159-30598-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 v6 17/20] trace: rename _read_events to read_events 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?= , Stefan Hajnoczi , "Daniel P. Berrange" The _read_events method is used by callers outside of its module, so should be a public method, not private. Reviewed-by: Stefan Hajnoczi Reviewed-by: Llu=C3=ADs Vilanova Signed-off-by: Daniel P. Berrange --- scripts/simpletrace.py | 6 +++--- scripts/tracetool/__init__.py | 14 ++++++++++++-- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/scripts/simpletrace.py b/scripts/simpletrace.py index f40467a..4ca903d 100755 --- a/scripts/simpletrace.py +++ b/scripts/simpletrace.py @@ -12,7 +12,7 @@ import struct import re import inspect -from tracetool import _read_events, Event +from tracetool import read_events, Event from tracetool.backend.simple import is_string =20 header_event_id =3D 0xffffffffffffffff @@ -129,7 +129,7 @@ class Analyzer(object): def process(events, log, analyzer, read_header=3DTrue): """Invoke an analyzer on each event in a log.""" if isinstance(events, str): - events =3D _read_events(open(events, 'r')) + events =3D read_events(open(events, 'r')) if isinstance(log, str): log =3D open(log, 'rb') =20 @@ -188,7 +188,7 @@ def run(analyzer): '\n' % sys.argv[0]) sys.exit(1) =20 - events =3D _read_events(open(sys.argv[1], 'r')) + events =3D read_events(open(sys.argv[1], 'r')) process(events, sys.argv[2], analyzer, read_header=3Dread_header) =20 if __name__ =3D=3D '__main__': diff --git a/scripts/tracetool/__init__.py b/scripts/tracetool/__init__.p= y index dc93416..bf01e93 100644 --- a/scripts/tracetool/__init__.py +++ b/scripts/tracetool/__init__.py @@ -282,7 +282,17 @@ class Event(object): self) =20 =20 -def _read_events(fobj): +def read_events(fobj): + """Generate the output for the given (format, backends) pair. + + Parameters + ---------- + fobj : file + Event description file. + + Returns a list of Event objects + """ + events =3D [] for line in fobj: if not line.strip(): @@ -391,6 +401,6 @@ def generate(fevents, format, backends, tracetool.backend.dtrace.BINARY =3D binary tracetool.backend.dtrace.PROBEPREFIX =3D probe_prefix =20 - events =3D _read_events(fevents) + events =3D read_events(fevents) =20 tracetool.format.generate(events, format, backend) --=20 2.7.4