diff mbox series

[i-g-t,2/6] intel_gpu_top: Automatically enclose JSON output into brackets

Message ID 20230127111241.3624629-3-tvrtko.ursulin@linux.intel.com (mailing list archive)
State New, archived
Headers show
Series Assorted intel_gpu_top improvements | expand

Commit Message

Tvrtko Ursulin Jan. 27, 2023, 11:12 a.m. UTC
From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>

Parsers need the whole output enclosed into square brackets so every
period sample becomes an array element.

So far we have been suggesting this in the man page but we can trivially
make the tool output that itself.

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Eero Tamminen <eero.t.tamminen@intel.com>
Reviewed-by: Kamil Konieczny <kamil.konieczny@linux.intel.com>
 man/intel_gpu_top.rst | 2 +-
 tools/intel_gpu_top.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)
diff mbox series


diff --git a/man/intel_gpu_top.rst b/man/intel_gpu_top.rst
index 4417bcff0d5b..caf0a9f9432c 100644
--- a/man/intel_gpu_top.rst
+++ b/man/intel_gpu_top.rst
@@ -79,7 +79,7 @@  pci          | ``pci:[vendor=%04x/name][,device=%04x][,card=%d]``  Select using
-To parse the JSON as output by the tool the consumer should wrap its entirety into square brackets ([ ]). This will make each sample point a JSON array element and will avoid "Multiple root elements" JSON validation error.
+JSON output will be correctly terminated when the tool cleanly exits, otherwise one square bracket needs to be added before parsing.
diff --git a/tools/intel_gpu_top.c b/tools/intel_gpu_top.c
index 6de8a164fcff..c4d98de4fe31 100644
--- a/tools/intel_gpu_top.c
+++ b/tools/intel_gpu_top.c
@@ -2597,6 +2597,9 @@  int main(int argc, char **argv)
 	scan_clients(clients, false);
 	codename = igt_device_get_pretty_name(&card, false);
+	if (output_mode == JSON)
+		printf("[\n");
 	while (!stop_top) {
 		struct clients *disp_clients;
 		bool consumed = false;
@@ -2683,6 +2686,9 @@  int main(int argc, char **argv)
+	if (output_mode == JSON)
+		printf("]\n");
 	if (clients)