ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

trace: rename _read_events to read_events 

The _read_events method is used by callers outside of
its module, so should be a public method, not private.

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Lluís Vilanova <vilanova@ac.upc.edu>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Message-id: 1475588159-30598-18-git-send-email-berrange@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Daniel P. Berrange 2016-10-04 14:35:56 +01:00 committed by Stefan Hajnoczi
parent 347701879c
commit d1b97bcea3
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/simpletrace.py
View File

@ -12,7 +12,7 @@
import struct import struct
import re import re
import inspect import inspect
from tracetool import _read_events, Event from tracetool import read_events, Event
from tracetool.backend.simple import is_string from tracetool.backend.simple import is_string
header_event_id = 0xffffffffffffffff header_event_id = 0xffffffffffffffff
@ -129,7 +129,7 @@ class Analyzer(object):
def process(events, log, analyzer, read_header=True): def process(events, log, analyzer, read_header=True):
"""Invoke an analyzer on each event in a log.""" """Invoke an analyzer on each event in a log."""
if isinstance(events, str): if isinstance(events, str):
events = _read_events(open(events, 'r')) events = read_events(open(events, 'r'))
if isinstance(log, str): if isinstance(log, str):
log = open(log, 'rb') log = open(log, 'rb')
@ -188,7 +188,7 @@ def run(analyzer):
'<trace-file>\n' % sys.argv[0]) '<trace-file>\n' % sys.argv[0])
sys.exit(1) 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) process(events, sys.argv[2], analyzer, read_header=read_header)
if __name__ == '__main__': if __name__ == '__main__':

14
scripts/tracetool/__init__.py
View File

@ -282,7 +282,17 @@ class Event(object):
self) 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 = [] events = []
for line in fobj: for line in fobj:
if not line.strip(): if not line.strip():
@ -391,6 +401,6 @@ def generate(fevents, format, backends,
tracetool.backend.dtrace.BINARY = binary tracetool.backend.dtrace.BINARY = binary
tracetool.backend.dtrace.PROBEPREFIX = probe_prefix tracetool.backend.dtrace.PROBEPREFIX = probe_prefix
events = _read_events(fevents) events = read_events(fevents)
tracetool.format.generate(events, format, backend) tracetool.format.generate(events, format, backend)