]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
cpu-gather: Transport data as json
authorTim Wiederhake <twiederh@redhat.com>
Tue, 15 Dec 2020 16:25:03 +0000 (17:25 +0100)
committerMichal Privoznik <mprivozn@redhat.com>
Fri, 18 Dec 2020 22:20:29 +0000 (23:20 +0100)
More reliable, easier to parse, easier to edit.

Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
tests/cputestdata/cpu-gather.py

index 83f175d342220c21f2b2165957da27c38f499d90..7c51a47353abcc30e03726a53603c81daa8a183e 100755 (executable)
@@ -193,9 +193,12 @@ def gather(args):
 
 
 def parse(args):
+    data = json.load(sys.stdin)
+
     os.environ["CPU_GATHER_PY"] = "true"
     output = subprocess.check_output(
         "./cpu-parse.sh",
+        input=output_to_text(data),
         stderr=subprocess.STDOUT,
         universal_newlines=True)
     print(output)
@@ -267,7 +270,7 @@ def main():
 
     if args.gather:
         data = gather(args)
-        print(output_to_text(data))
+        json.dump(data, sys.stdout, indent=2)
     else:
         parse(args)