From: Leslie Monis <lesliemonis@gmail.com>
To: Linux NetDev <netdev@vger.kernel.org>
Cc: David Ahern <dsahern@gmail.com>,
Stephen Hemminger <stephen@networkplumber.org>
Subject: [PATCH iproute2-next 02/10] tc: choke: add support for JSON output
Date: Thu, 26 Dec 2019 00:34:10 +0530 [thread overview]
Message-ID: <20191225190418.8806-3-lesliemonis@gmail.com> (raw)
In-Reply-To: <20191225190418.8806-1-lesliemonis@gmail.com>
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>
---
tc/q_choke.c | 26 ++++++++++++++++++--------
1 file changed, 18 insertions(+), 8 deletions(-)
diff --git a/tc/q_choke.c b/tc/q_choke.c
index 648d9ad7..570c3599 100644
--- a/tc/q_choke.c
+++ b/tc/q_choke.c
@@ -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))
max_P = rta_getattr_u32(tb[TCA_CHOKE_MAX_P]);
- fprintf(f, "limit %up min %up max %up ",
- qopt->limit, qopt->qth_min, qopt->qth_max);
+ print_uint(PRINT_ANY, "limit", "limit %up ", qopt->limit);
+ 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);
if (show_details) {
- fprintf(f, "ewma %u ", qopt->Wlog);
+ print_uint(PRINT_ANY, "ewma", "ewma %u ", qopt->Wlog);
+
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
- fprintf(f, "Plog %u ", qopt->Plog);
- fprintf(f, "Scell_log %u", qopt->Scell_log);
+ print_uint(PRINT_ANY, "Plog", "Plog %u ", qopt->Plog);
+
+ print_uint(PRINT_ANY, "Scell_log", "Scell_log %u",
+ qopt->Scell_log);
}
return 0;
}
@@ -214,8 +219,13 @@ static int choke_print_xstats(struct qdisc_util *qu, FILE *f,
return -1;
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;
}
--
2.17.1
next prev parent reply other threads:[~2019-12-25 19:04 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-25 19:04 [PATCH iproute2-next 00/10] tc: add support for JSON output in some qdiscs Leslie Monis
2019-12-25 19:04 ` [PATCH iproute2-next 01/10] tc: cbs: add support for JSON output Leslie Monis
2019-12-25 19:04 ` Leslie Monis [this message]
2019-12-25 19:04 ` [PATCH iproute2-next 03/10] tc: codel: " Leslie Monis
2019-12-25 19:04 ` [PATCH iproute2-next 04/10] tc: fq: " Leslie Monis
2019-12-25 19:04 ` [PATCH iproute2-next 05/10] tc: hhf: " Leslie Monis
2019-12-25 19:04 ` [PATCH iproute2-next 06/10] tc: pie: " Leslie Monis
2019-12-25 19:04 ` [PATCH iproute2-next 07/10] tc: sfb: " Leslie Monis
2019-12-25 19:04 ` [PATCH iproute2-next 08/10] tc: sfq: " Leslie Monis
2019-12-25 19:04 ` [PATCH iproute2-next 09/10] tc: tbf: " Leslie Monis
2019-12-25 19:04 ` [PATCH iproute2-next 10/10] tc: fq_codel: fix missing statistic in " Leslie Monis
2019-12-27 2:19 ` [PATCH iproute2-next 00/10] tc: add support for JSON output in some qdiscs Stephen Hemminger
2019-12-27 11:13 ` Leslie Monis
2019-12-29 18:04 ` Stephen Hemminger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191225190418.8806-3-lesliemonis@gmail.com \
--to=lesliemonis@gmail.com \
--cc=dsahern@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=stephen@networkplumber.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).