ahill/iproute2
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/iproute2/iproute2.git synced 2026-01-26 14:13:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

nstat: convert to high-level json_print API

Browse Source 
Replace the low-level json_writer API calls with the high-level
json_print API to maintain consistency with the rest of the iproute2
codebase.

Signed-off-by: Andrea Claudi <aclaudi@redhat.com>
Signed-off-by: David Ahern <dsahern@kernel.org>
This commit is contained in:
Andrea Claudi 2025-10-21 22:39:17 +02:00 committed by David Ahern
parent 8ee82e82c0
commit 536fc07e33
1 changed files with 21 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
misc/nstat.c
View File

@ -24,7 +24,7 @@
#include <math.h>
#include <getopt.h>
#include <json_writer.h>
#include "json_print.h"
#include "version.h"
#include "utils.h"
@ -309,15 +309,13 @@ static void load_netstat(void)
static void dump_kern_db(FILE *fp, int to_hist)
{
json_writer_t *jw = json_output ? jsonw_new(fp) : NULL;
struct nstat_ent *n, *h;
h = hist_db;
if (jw) {
jsonw_start_object(jw);
jsonw_pretty(jw, pretty);
jsonw_name(jw, info_source);
jsonw_start_object(jw);
new_json_obj_plain(json_output);
if (is_json_context()) {
open_json_object(NULL);
open_json_object(info_source);
} else
fprintf(fp, "#%s\n", info_source);
@ -340,31 +338,28 @@ static void dump_kern_db(FILE *fp, int to_hist)
}
}
if (jw)
jsonw_uint_field(jw, n->id, val);
if (is_json_context())
print_lluint(PRINT_JSON, n->id, NULL, val);
else
fprintf(fp, "%-32s%-16llu%6.1f\n", n->id, val, n->rate);
}
if (jw) {
jsonw_end_object(jw);
jsonw_end_object(jw);
jsonw_destroy(&jw);
if (is_json_context()) {
close_json_object();
close_json_object();
}
delete_json_obj_plain();
}
static void dump_incr_db(FILE *fp)
{
json_writer_t *jw = json_output ? jsonw_new(fp) : NULL;
struct nstat_ent *n, *h;
h = hist_db;
if (jw) {
jsonw_start_object(jw);
jsonw_pretty(jw, pretty);
jsonw_name(jw, info_source);
jsonw_start_object(jw);
new_json_obj_plain(json_output);
if (is_json_context()) {
open_json_object(NULL);
open_json_object(info_source);
} else
fprintf(fp, "#%s\n", info_source);
@ -389,19 +384,18 @@ static void dump_incr_db(FILE *fp)
if (!match(n->id))
continue;
if (jw)
jsonw_uint_field(jw, n->id, val);
if (is_json_context())
print_lluint(PRINT_JSON, n->id, NULL, val);
else
fprintf(fp, "%-32s%-16llu%6.1f%s\n", n->id, val,
n->rate, ovfl?" (overflow)":"");
}
if (jw) {
jsonw_end_object(jw);
jsonw_end_object(jw);
jsonw_destroy(&jw);
if (is_json_context()) {
close_json_object();
close_json_object();
}
delete_json_obj_plain();
}
static int children;