From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36409) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1blzt5-0007Dl-9X for qemu-devel@nongnu.org; Mon, 19 Sep 2016 10:49:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1blzt1-0005z7-TI for qemu-devel@nongnu.org; Mon, 19 Sep 2016 10:49:38 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59718) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1blzt1-0005yl-Mh for qemu-devel@nongnu.org; Mon, 19 Sep 2016 10:49:35 -0400 From: "Daniel P. Berrange" Date: Mon, 19 Sep 2016 15:49:06 +0100 Message-Id: <1474296549-29171-16-git-send-email-berrange@redhat.com> In-Reply-To: <1474296549-29171-1-git-send-email-berrange@redhat.com> References: <1474296549-29171-1-git-send-email-berrange@redhat.com> Subject: [Qemu-devel] [PATCH v3 15/18] 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: Stefan Hajnoczi , =?UTF-8?q?Llu=C3=ADs=20Vilanova?= , "Daniel P. Berrange" The _read_events method is used by callers outside of its module, so should be a public method, not private. 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 98abb7a..5dc71d3 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 header_event_id = 0xffffffffffffffff @@ -128,7 +128,7 @@ class Analyzer(object): def process(events, log, analyzer, read_header=True): """Invoke an analyzer on each event in a log.""" if isinstance(events, str): - events = _read_events(open(events, 'r')) + events = read_events(open(events, 'r')) if isinstance(log, str): log = open(log, 'rb') @@ -187,7 +187,7 @@ def run(analyzer): '\n' % sys.argv[0]) sys.exit(1) - events = _read_events(open(sys.argv[1], 'r')) + events = read_events(open(sys.argv[1], 'r')) process(events, sys.argv[2], analyzer, read_header=read_header) if __name__ == '__main__': diff --git a/scripts/tracetool/__init__.py b/scripts/tracetool/__init__.py index 5191df9..1bb3886 100644 --- a/scripts/tracetool/__init__.py +++ b/scripts/tracetool/__init__.py @@ -281,7 +281,17 @@ class Event(object): self) -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 = [] for line in fobj: if not line.strip(): @@ -390,6 +400,6 @@ def generate(fevents, format, backends, tracetool.backend.dtrace.BINARY = binary tracetool.backend.dtrace.PROBEPREFIX = probe_prefix - events = _read_events(fevents) + events = read_events(fevents) tracetool.format.generate(events, format, backend) -- 2.7.4