[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 3/5] tracetool: add out_lineno and out_next_lineno to out()
From: |
Stefan Hajnoczi |
Subject: |
[PULL 3/5] tracetool: add out_lineno and out_next_lineno to out() |
Date: |
Mon, 4 Jan 2021 14:31:52 +0000 |
Make the output file line number and next line number available to
out().
A later patch will use this to improve error messages.
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20200827142915.108730-3-stefanha@redhat.com>
---
scripts/tracetool/__init__.py | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/scripts/tracetool/__init__.py b/scripts/tracetool/__init__.py
index a6013389a0..da5004ea45 100644
--- a/scripts/tracetool/__init__.py
+++ b/scripts/tracetool/__init__.py
@@ -31,6 +31,7 @@ def error(*lines):
sys.exit(1)
+out_lineno = 1
out_filename = '<none>'
out_fobj = sys.stdout
@@ -45,12 +46,19 @@ def out(*lines, **kwargs):
You can use kwargs as a shorthand for mapping variables when formatting all
the strings in lines.
- The 'out_filename' kwarg is automatically added with the output filename.
+ The 'out_lineno' kwarg is automatically added to reflect the current output
+ file line number. The 'out_next_lineno' kwarg is also automatically added
+ with the next output line number. The 'out_filename' kwarg is automatically
+ added with the output filename.
"""
+ global out_lineno
output = []
for l in lines:
+ kwargs['out_lineno'] = out_lineno
+ kwargs['out_next_lineno'] = out_lineno + 1
kwargs['out_filename'] = out_filename
output.append(l % kwargs)
+ out_lineno += 1
out_fobj.writelines("\n".join(output) + "\n")
--
2.29.2
- [PULL 0/5] Tracing patches, Stefan Hajnoczi, 2021/01/04
- [PULL 1/5] trace: Send "-d trace:help" output to stdout, Stefan Hajnoczi, 2021/01/04
- [PULL 2/5] tracetool: add output filename command-line argument, Stefan Hajnoczi, 2021/01/04
- [PULL 3/5] tracetool: add out_lineno and out_next_lineno to out(),
Stefan Hajnoczi <=
- [PULL 4/5] tracetool: add input filename and line number to Event, Stefan Hajnoczi, 2021/01/04
- [PULL 5/5] tracetool: show trace-events filename/lineno in fmt string errors, Stefan Hajnoczi, 2021/01/04
- Re: [PULL 0/5] Tracing patches, no-reply, 2021/01/04
- Re: [PULL 0/5] Tracing patches, Peter Maydell, 2021/01/05