| Message ID | 1474296549-29171-17-git-send-email-berrange@redhat.com |
|---|---|
| State | New |
| Headers | show |
Daniel P Berrange writes: > 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. > Signed-off-by: Daniel P. Berrange <berrange@redhat.com> Reviewed-by: Lluís Vilanova <vilanova@ac.upc.edu> > --- > 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 = ".".join(["qemu", target_type, target_name]) > + events = tracetool.read_events(sys.stdin) > + > try: > - tracetool.generate(sys.stdin, arg_format, arg_backends, > + tracetool.generate(events, arg_format, arg_backends, > binary=binary, probe_prefix=probe_prefix) > except tracetool.TracetoolError as e: > error_opt(str(e)) > diff --git a/scripts/tracetool/__init__.py b/scripts/tracetool/__init__.py > index 1bb3886..ed668a1 100644 > --- a/scripts/tracetool/__init__.py > +++ b/scripts/tracetool/__init__.py > @@ -363,14 +363,14 @@ def try_import(mod_name, attr_name=None, attr_default=None): > return False, None > -def generate(fevents, format, backends, > +def generate(events, format, backends, > binary=None, probe_prefix=None): > """Generate the output for the given (format, backends) pair. > Parameters > ---------- > - fevents : file > - Event description file. > + events : list > + list of Event objects to generate for > format : str > Output format name. > backends : list > @@ -400,6 +400,4 @@ def generate(fevents, format, backends, > tracetool.backend.dtrace.BINARY = binary > tracetool.backend.dtrace.PROBEPREFIX = probe_prefix > - events = read_events(fevents) > - > tracetool.format.generate(events, format, backend) > -- > 2.7.4
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 = ".".join(["qemu", target_type, target_name]) + events = tracetool.read_events(sys.stdin) + try: - tracetool.generate(sys.stdin, arg_format, arg_backends, + tracetool.generate(events, arg_format, arg_backends, binary=binary, probe_prefix=probe_prefix) except tracetool.TracetoolError as e: error_opt(str(e)) diff --git a/scripts/tracetool/__init__.py b/scripts/tracetool/__init__.py index 1bb3886..ed668a1 100644 --- a/scripts/tracetool/__init__.py +++ b/scripts/tracetool/__init__.py @@ -363,14 +363,14 @@ def try_import(mod_name, attr_name=None, attr_default=None): return False, None -def generate(fevents, format, backends, +def generate(events, format, backends, binary=None, probe_prefix=None): """Generate the output for the given (format, backends) pair. Parameters ---------- - fevents : file - Event description file. + events : list + list of Event objects to generate for format : str Output format name. backends : list @@ -400,6 +400,4 @@ def generate(fevents, format, backends, tracetool.backend.dtrace.BINARY = binary tracetool.backend.dtrace.PROBEPREFIX = probe_prefix - events = read_events(fevents) - tracetool.format.generate(events, format, backend)
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. Signed-off-by: Daniel P. Berrange <berrange@redhat.com> --- scripts/tracetool.py | 4 +++- scripts/tracetool/__init__.py | 8 +++----- 2 files changed, 6 insertions(+), 6 deletions(-)