kata-containers/s390-tools
1
0
Fork 0
mirror of https://github.com/ibm-s390-linux/s390-tools.git synced 2026-08-05 02:14:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

hyptop: Adapt to new JSON Lines text format

Browse Source 
util_fmt now provides support for JSON Lines text format. Adapt certain
checks in the code and document the newly supported format in the man
page accordingly.

Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>
This commit is contained in:
Jan Höppner
2026-04-01 17:53:39 +02:00
parent f9e07c3916
commit 182892da12
3 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
hyptop/hyptop.8
View File

@@ -96,6 +96,17 @@ with an ASCII Record Separator character (0x1e) and suffixed with an ASCII Line
Feed character (0x0a) in accordance with RFC7464. Feed character (0x0a) in accordance with RFC7464.
.BR .BR
See section "OUTPUT FORMAT" for more details.
.BR
.PP
.IP \(bu 3
.B jsonl:
Line-delimited JSON data structures
Data for each iteration is formatted as a separate JSON data structure
separated by ASCII Line Feed character (0x0a, LF).
.BR
See section "OUTPUT FORMAT" for more details. See section "OUTPUT FORMAT" for more details.
.BR .BR
.PP .PP
@@ -458,6 +469,14 @@ Subsequent objects each represent performance data for one iteration
.br .br
.PP .PP
.SS jsonl
The jsonl output format is a data streaming variation of the JSON output format
described above with the same properties as the json\-seq output with the
difference that JSON data is separated only by an ASCII Line Feed character
(0x0a, LF).
.SH EXAMPLES .SH EXAMPLES
To start hyptop with the "sys_list" window in interactive mode, enter: To start hyptop with the "sys_list" window in interactive mode, enter:
.br .br

2
hyptop/hyptop.c
View File

@@ -233,7 +233,7 @@ static void l_fmt_init(void)
flags |= FMT_QUOTEALL; flags |= FMT_QUOTEALL;
if (g.o.format == FMT_CSV || g.o.format_all) if (g.o.format == FMT_CSV || g.o.format_all)
flags |= FMT_KEEPINVAL; flags |= FMT_KEEPINVAL;
if (g.o.format == FMT_JSON || g.o.format == FMT_JSONSEQ) if (util_fmt_is_json(g.o.format))
flags |= FMT_HANDLEINT; flags |= FMT_HANDLEINT;
util_fmt_init(stdout, g.o.format, flags, 1); util_fmt_init(stdout, g.o.format, flags, 1);
} }

4
hyptop/table.c
View File

@@ -1037,7 +1037,7 @@ void table_fmt_start(void)
{ {
if (!g.o.format_specified) if (!g.o.format_specified)
return; return;
if (g.o.format != FMT_JSONSEQ) if (!util_fmt_is_json_stream(g.o.format))
util_fmt_obj_start(FMT_LIST, "hyptop"); util_fmt_obj_start(FMT_LIST, "hyptop");
} }
@@ -1045,7 +1045,7 @@ void table_fmt_end(void)
{ {
if (!g.o.format_specified) if (!g.o.format_specified)
return; return;
if (g.o.format != FMT_JSONSEQ) if (!util_fmt_is_json_stream(g.o.format))
util_fmt_obj_end(); /* hyptop[] */ util_fmt_obj_end(); /* hyptop[] */
} }