proxmox-mirrors/mirror_iproute2
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_iproute2 synced 2025-10-04 12:45:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tc: choke: add support for JSON output

Browse Source 
Enable proper JSON output for the choke Qdisc.
Also, use the long double format specifier to print the value of
"probability".

Signed-off-by: Leslie Monis <lesliemonis@gmail.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
This commit is contained in:
Leslie Monis 2019-12-26 00:34:10 +05:30 committed by Stephen Hemminger
parent d8f673074b
commit d3136b1e80
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
tc/q_choke.c
View File

@ -186,18 +186,23 @@ static int choke_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt)
RTA_PAYLOAD(tb[TCA_CHOKE_MAX_P]) >= sizeof(__u32)) RTA_PAYLOAD(tb[TCA_CHOKE_MAX_P]) >= sizeof(__u32))
max_P = rta_getattr_u32(tb[TCA_CHOKE_MAX_P]); max_P = rta_getattr_u32(tb[TCA_CHOKE_MAX_P]);
fprintf(f, "limit %up min %up max %up ", print_uint(PRINT_ANY, "limit", "limit %up ", qopt->limit);
qopt->limit, qopt->qth_min, qopt->qth_max); print_uint(PRINT_ANY, "min", "min %up ", qopt->qth_min);
print_uint(PRINT_ANY, "max", "max %up ", qopt->qth_max);
tc_red_print_flags(qopt->flags); tc_red_print_flags(qopt->flags);
if (show_details) { if (show_details) {
fprintf(f, "ewma %u ", qopt->Wlog); print_uint(PRINT_ANY, "ewma", "ewma %u ", qopt->Wlog);
if (max_P) if (max_P)
fprintf(f, "probability %g ", max_P / pow(2, 32)); print_float(PRINT_ANY, "probability",
"probability %lg ", max_P / pow(2, 32));
else else
fprintf(f, "Plog %u ", qopt->Plog); print_uint(PRINT_ANY, "Plog", "Plog %u ", qopt->Plog);
fprintf(f, "Scell_log %u", qopt->Scell_log);
print_uint(PRINT_ANY, "Scell_log", "Scell_log %u",
qopt->Scell_log);
} }
return 0; return 0;
} }
@ -214,8 +219,13 @@ static int choke_print_xstats(struct qdisc_util *qu, FILE *f,
return -1; return -1;
st = RTA_DATA(xstats); st = RTA_DATA(xstats);
fprintf(f, " marked %u early %u pdrop %u other %u matched %u",
st->marked, st->early, st->pdrop, st->other, st->matched); print_uint(PRINT_ANY, "marked", " marked %u", st->marked);
print_uint(PRINT_ANY, "early", " early %u", st->early);
print_uint(PRINT_ANY, "pdrop", " pdrop %u", st->pdrop);
print_uint(PRINT_ANY, "other", " other %u", st->other);
print_uint(PRINT_ANY, "matched", " matched %u", st->matched);
return 0; return 0;
} }