diff options
author | Max Tottenham <mtottenh@akamai.com> | 2023-01-09 05:53:16 -0500 |
---|---|---|
committer | Stephen Hemminger <stephen@networkplumber.org> | 2023-01-09 13:27:41 -0800 |
commit | 010a8388aea11e767ba3a2506728b9ad9760df0e (patch) | |
tree | c4ed26b75d51cd729ed07a54c7dfe88fed8cf49c /tc | |
parent | b16d14aaad61c75e5adb8c9dc2f5ae6932b0d67a (diff) | |
download | iproute2-010a8388aea11e767ba3a2506728b9ad9760df0e.tar.gz |
tc: Add JSON output to tc-class
* Add JSON formatted output to the `tc class show ...` command.
* Add JSON formatted output for the htb qdisc classes.
Signed-off-by: Max Tottenham <mtottenh@akamai.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Diffstat (limited to 'tc')
-rw-r--r-- | tc/q_htb.c | 36 | ||||
-rw-r--r-- | tc/tc_class.c | 28 |
2 files changed, 37 insertions, 27 deletions
@@ -307,27 +307,27 @@ static int htb_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt) RTA_PAYLOAD(tb[TCA_HTB_CEIL64]) >= sizeof(ceil64)) ceil64 = rta_getattr_u64(tb[TCA_HTB_CEIL64]); - tc_print_rate(PRINT_FP, NULL, "rate %s ", rate64); + tc_print_rate(PRINT_ANY, "rate", "rate %s ", rate64); if (hopt->rate.overhead) - fprintf(f, "overhead %u ", hopt->rate.overhead); + print_uint(PRINT_ANY, "overhead", "overhead %u ", hopt->rate.overhead); buffer = tc_calc_xmitsize(rate64, hopt->buffer); - tc_print_rate(PRINT_FP, NULL, "ceil %s ", ceil64); + tc_print_rate(PRINT_ANY, "ceil", "ceil %s ", ceil64); cbuffer = tc_calc_xmitsize(ceil64, hopt->cbuffer); linklayer = (hopt->rate.linklayer & TC_LINKLAYER_MASK); if (linklayer > TC_LINKLAYER_ETHERNET || show_details) - fprintf(f, "linklayer %s ", sprint_linklayer(linklayer, b3)); + print_string(PRINT_ANY, "linklayer", "linklayer %s ", sprint_linklayer(linklayer, b3)); if (show_details) { - print_size(PRINT_FP, NULL, "burst %s/", buffer); - fprintf(f, "%u ", 1<<hopt->rate.cell_log); - print_size(PRINT_FP, NULL, "mpu %s ", hopt->rate.mpu); - print_size(PRINT_FP, NULL, "cburst %s/", cbuffer); - fprintf(f, "%u ", 1<<hopt->ceil.cell_log); - print_size(PRINT_FP, NULL, "mpu %s ", hopt->ceil.mpu); - fprintf(f, "level %d ", (int)hopt->level); + print_size(PRINT_ANY, "burst", "burst %s/", buffer); + print_uint(PRINT_ANY, "burst_cell", "%u", 1<<hopt->rate.cell_log); + print_size(PRINT_ANY, "mpu_rate", "mpu %s ", hopt->rate.mpu); + print_size(PRINT_ANY, "cburst", "cburst %s/", cbuffer); + print_uint(PRINT_ANY, "cburst_cell", "%u", 1<<hopt->ceil.cell_log); + print_size(PRINT_ANY, "mpu_ceil", "mpu %s ", hopt->ceil.mpu); + print_int(PRINT_ANY, "level", "level %d ", (int)hopt->level); } else { - print_size(PRINT_FP, NULL, "burst %s ", buffer); - print_size(PRINT_FP, NULL, "cburst %s ", cbuffer); + print_size(PRINT_ANY, "burst", "burst %s ", buffer); + print_size(PRINT_ANY, "cburst", "cburst %s", cbuffer); } if (show_raw) fprintf(f, "buffer [%08x] cbuffer [%08x] ", @@ -369,9 +369,13 @@ static int htb_print_xstats(struct qdisc_util *qu, FILE *f, struct rtattr *xstat return -1; st = RTA_DATA(xstats); - fprintf(f, " lended: %u borrowed: %u giants: %u\n", - st->lends, st->borrows, st->giants); - fprintf(f, " tokens: %d ctokens: %d\n", st->tokens, st->ctokens); + print_uint(PRINT_ANY, "lended", " lended: %u ", st->lends); + print_uint(PRINT_ANY, "borrowed", "borrowed: %u ", st->borrows); + print_uint(PRINT_ANY, "giants", "giants: %u", st->giants); + print_nl(); + print_int(PRINT_ANY, "tokens", " tokens: %d ", st->tokens); + print_int(PRINT_ANY, "ctokens", "ctokens: %d", st->ctokens); + print_nl(); return 0; } diff --git a/tc/tc_class.c b/tc/tc_class.c index 1297d152..409af2db 100644 --- a/tc/tc_class.c +++ b/tc/tc_class.c @@ -334,8 +334,9 @@ int print_class(struct nlmsghdr *n, void *arg) return -1; } + open_json_object(NULL); if (n->nlmsg_type == RTM_DELTCLASS) - fprintf(fp, "deleted "); + print_null(PRINT_ANY, "deleted", "deleted ", NULL); abuf[0] = 0; if (t->tcm_handle) { @@ -344,22 +345,24 @@ int print_class(struct nlmsghdr *n, void *arg) else print_tc_classid(abuf, sizeof(abuf), t->tcm_handle); } - fprintf(fp, "class %s %s ", rta_getattr_str(tb[TCA_KIND]), abuf); + print_string(PRINT_ANY, "class", "class %s ", rta_getattr_str(tb[TCA_KIND])); + print_string(PRINT_ANY, "handle", "%s ", abuf); if (filter_ifindex == 0) - fprintf(fp, "dev %s ", ll_index_to_name(t->tcm_ifindex)); + print_devname(PRINT_ANY, t->tcm_ifindex); if (t->tcm_parent == TC_H_ROOT) - fprintf(fp, "root "); + print_bool(PRINT_ANY, "root", "root ", true); else { if (filter_qdisc) print_tc_classid(abuf, sizeof(abuf), TC_H_MIN(t->tcm_parent)); else print_tc_classid(abuf, sizeof(abuf), t->tcm_parent); - fprintf(fp, "parent %s ", abuf); + print_string(PRINT_ANY, "parent", "parent %s ", abuf); } if (t->tcm_info) - fprintf(fp, "leaf %x: ", t->tcm_info>>16); + print_0xhex(PRINT_ANY, "leaf", "leaf %x", t->tcm_info>>16); + q = get_qdisc_kind(RTA_DATA(tb[TCA_KIND])); if (tb[TCA_OPTIONS]) { if (q && q->print_copt) @@ -367,19 +370,21 @@ int print_class(struct nlmsghdr *n, void *arg) else fprintf(stderr, "[cannot parse class parameters]"); } - fprintf(fp, "\n"); + print_nl(); if (show_stats) { struct rtattr *xstats = NULL; - + open_json_object("stats"); if (tb[TCA_STATS] || tb[TCA_STATS2]) { print_tcstats_attr(fp, tb, " ", &xstats); - fprintf(fp, "\n"); + print_string(PRINT_FP, NULL, "\n", NULL); } if (q && (xstats || tb[TCA_XSTATS]) && q->print_xstats) { q->print_xstats(q, fp, xstats ? : tb[TCA_XSTATS]); - fprintf(fp, "\n"); + print_string(PRINT_FP, NULL, "\n", NULL); } + close_json_object(); } + close_json_object(); fflush(fp); return 0; } @@ -450,11 +455,12 @@ static int tc_class_list(int argc, char **argv) perror("Cannot send dump request"); return 1; } - + new_json_obj(json); if (rtnl_dump_filter(&rth, print_class, stdout) < 0) { fprintf(stderr, "Dump terminated\n"); return 1; } + delete_json_obj(); if (show_graph) graph_cls_show(stdout, &buf[0], &root_cls_list, 0); |