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

trace: push reading of events up a level to tracetool main 

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: 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-19-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:57 +01:00 committed by Stefan Hajnoczi
parent d1b97bcea3
commit 9096b78a38
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/tracetool.py
View File

@ -129,8 +129,10 @@ def main(args):
if probe_prefix is None: if probe_prefix is None:
probe_prefix = ".".join(["qemu", target_type, target_name]) probe_prefix = ".".join(["qemu", target_type, target_name])
events = tracetool.read_events(sys.stdin)
try: try:
tracetool.generate(sys.stdin, arg_format, arg_backends, tracetool.generate(events, arg_format, arg_backends,
binary=binary, probe_prefix=probe_prefix) binary=binary, probe_prefix=probe_prefix)
except tracetool.TracetoolError as e: except tracetool.TracetoolError as e:
error_opt(str(e)) error_opt(str(e))

8
scripts/tracetool/__init__.py
View File

@ -364,14 +364,14 @@ def try_import(mod_name, attr_name=None, attr_default=None):
return False, None return False, None
def generate(fevents, format, backends, def generate(events, format, backends,
binary=None, probe_prefix=None): binary=None, probe_prefix=None):
"""Generate the output for the given (format, backends) pair. """Generate the output for the given (format, backends) pair.
Parameters Parameters
---------- ----------
fevents : file events : list
Event description file. list of Event objects to generate for
format : str format : str
Output format name. Output format name.
backends : list backends : list
@ -401,6 +401,4 @@ 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)
tracetool.format.generate(events, format, backend) tracetool.format.generate(events, format, backend)