matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tc: pie: add support for JSON output 

Enable proper JSON output for the PIE Qdisc.
Use sprint_time() to print the value of tc_pie_xstats->delay.
Use the long double format specifier to print tc_pie_xstats->prob.
Also, fix the indentation in the oneline output of statistics and update
the man page to reflect this change.

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:14 +05:30 committed by Stephen Hemminger
parent f6564ed60d
commit 0154d096c5
2 changed files with 38 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
tc/q_pie.c
View File

@ -156,40 +156,44 @@ static int pie_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt)
if (tb[TCA_PIE_LIMIT] && if (tb[TCA_PIE_LIMIT] &&
RTA_PAYLOAD(tb[TCA_PIE_LIMIT]) >= sizeof(__u32)) { RTA_PAYLOAD(tb[TCA_PIE_LIMIT]) >= sizeof(__u32)) {
limit = rta_getattr_u32(tb[TCA_PIE_LIMIT]); limit = rta_getattr_u32(tb[TCA_PIE_LIMIT]);
fprintf(f, "limit %up ", limit); print_uint(PRINT_ANY, "limit", "limit %up ", limit);
} }
if (tb[TCA_PIE_TARGET] && if (tb[TCA_PIE_TARGET] &&
RTA_PAYLOAD(tb[TCA_PIE_TARGET]) >= sizeof(__u32)) { RTA_PAYLOAD(tb[TCA_PIE_TARGET]) >= sizeof(__u32)) {
target = rta_getattr_u32(tb[TCA_PIE_TARGET]); target = rta_getattr_u32(tb[TCA_PIE_TARGET]);
fprintf(f, "target %s ", sprint_time(target, b1)); print_uint(PRINT_JSON, "target", NULL, target);
print_string(PRINT_FP, NULL, "target %s ",
sprint_time(target, b1));
} }
if (tb[TCA_PIE_TUPDATE] && if (tb[TCA_PIE_TUPDATE] &&
RTA_PAYLOAD(tb[TCA_PIE_TUPDATE]) >= sizeof(__u32)) { RTA_PAYLOAD(tb[TCA_PIE_TUPDATE]) >= sizeof(__u32)) {
tupdate = rta_getattr_u32(tb[TCA_PIE_TUPDATE]); tupdate = rta_getattr_u32(tb[TCA_PIE_TUPDATE]);
fprintf(f, "tupdate %s ", sprint_time(tupdate, b1)); print_uint(PRINT_JSON, "tupdate", NULL, tupdate);
print_string(PRINT_FP, NULL, "tupdate %s ",
sprint_time(tupdate, b1));
} }
if (tb[TCA_PIE_ALPHA] && if (tb[TCA_PIE_ALPHA] &&
RTA_PAYLOAD(tb[TCA_PIE_ALPHA]) >= sizeof(__u32)) { RTA_PAYLOAD(tb[TCA_PIE_ALPHA]) >= sizeof(__u32)) {
alpha = rta_getattr_u32(tb[TCA_PIE_ALPHA]); alpha = rta_getattr_u32(tb[TCA_PIE_ALPHA]);
fprintf(f, "alpha %u ", alpha); print_uint(PRINT_ANY, "alpha", "alpha %u ", alpha);
} }
if (tb[TCA_PIE_BETA] && if (tb[TCA_PIE_BETA] &&
RTA_PAYLOAD(tb[TCA_PIE_BETA]) >= sizeof(__u32)) { RTA_PAYLOAD(tb[TCA_PIE_BETA]) >= sizeof(__u32)) {
beta = rta_getattr_u32(tb[TCA_PIE_BETA]); beta = rta_getattr_u32(tb[TCA_PIE_BETA]);
fprintf(f, "beta %u ", beta); print_uint(PRINT_ANY, "beta", "beta %u ", beta);
} }
if (tb[TCA_PIE_ECN] && RTA_PAYLOAD(tb[TCA_PIE_ECN]) >= sizeof(__u32)) { if (tb[TCA_PIE_ECN] && RTA_PAYLOAD(tb[TCA_PIE_ECN]) >= sizeof(__u32)) {
ecn = rta_getattr_u32(tb[TCA_PIE_ECN]); ecn = rta_getattr_u32(tb[TCA_PIE_ECN]);
if (ecn) if (ecn)
fprintf(f, "ecn "); print_bool(PRINT_ANY, "ecn", "ecn ", true);
} }
if (tb[TCA_PIE_BYTEMODE] && if (tb[TCA_PIE_BYTEMODE] &&
RTA_PAYLOAD(tb[TCA_PIE_BYTEMODE]) >= sizeof(__u32)) { RTA_PAYLOAD(tb[TCA_PIE_BYTEMODE]) >= sizeof(__u32)) {
bytemode = rta_getattr_u32(tb[TCA_PIE_BYTEMODE]); bytemode = rta_getattr_u32(tb[TCA_PIE_BYTEMODE]);
if (bytemode) if (bytemode)
fprintf(f, "bytemode "); print_bool(PRINT_ANY, "bytemode", "bytemode ", true);
} }
if (tb[TCA_PIE_DQ_RATE_ESTIMATOR] && if (tb[TCA_PIE_DQ_RATE_ESTIMATOR] &&
@ -197,7 +201,8 @@ static int pie_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt)
dq_rate_estimator = dq_rate_estimator =
rta_getattr_u32(tb[TCA_PIE_DQ_RATE_ESTIMATOR]); rta_getattr_u32(tb[TCA_PIE_DQ_RATE_ESTIMATOR]);
if (dq_rate_estimator) if (dq_rate_estimator)
fprintf(f, "dq_rate_estimator "); print_bool(PRINT_ANY, "dq_rate_estimator",
"dq_rate_estimator ", true);
} }
return 0; return 0;
@ -208,6 +213,8 @@ static int pie_print_xstats(struct qdisc_util *qu, FILE *f,
{ {
struct tc_pie_xstats *st; struct tc_pie_xstats *st;
SPRINT_BUF(b1);
if (xstats == NULL) if (xstats == NULL)
return 0; return 0;
@ -215,18 +222,24 @@ static int pie_print_xstats(struct qdisc_util *qu, FILE *f,
return -1; return -1;
st = RTA_DATA(xstats); st = RTA_DATA(xstats);
/*prob is returned as a fracion of maximum integer value */
fprintf(f, "prob %f delay %uus", /* prob is returned as a fracion of maximum integer value */
(double)st->prob / (double)UINT64_MAX, st->delay); print_float(PRINT_ANY, "prob", " prob %lg",
(double)st->prob / (double)UINT64_MAX);
print_uint(PRINT_JSON, "delay", NULL, st->delay);
print_string(PRINT_FP, NULL, " delay %s", sprint_time(st->delay, b1));
if (st->dq_rate_estimating) if (st->dq_rate_estimating)
fprintf(f, " avg_dq_rate %u\n", st->avg_dq_rate); print_uint(PRINT_ANY, "avg_dq_rate", " avg_dq_rate %u",
else st->avg_dq_rate);
fprintf(f, "\n");
print_nl();
print_uint(PRINT_ANY, "pkts_in", " pkts_in %u", st->packets_in);
print_uint(PRINT_ANY, "overlimit", " overlimit %u", st->overlimit);
print_uint(PRINT_ANY, "dropped", " dropped %u", st->dropped);
print_uint(PRINT_ANY, "maxq", " maxq %u", st->maxq);
print_uint(PRINT_ANY, "ecn_mark", " ecn_mark %u", st->ecn_mark);
fprintf(f, "pkts_in %u overlimit %u dropped %u maxq %u ecn_mark %u\n",
st->packets_in, st->overlimit, st->dropped, st->maxq,
st->ecn_mark);
return 0; return 0;
} }