[v2,iproute2-next,07/31] tc/red: use new JSON helpers

Message ID	20180710210558.20278-8-stephen@networkplumber.org
State	Changes Requested, archived
Delegated to:	David Ahern
Headers	show Return-Path: <netdev-owner@vger.kernel.org> From: Stephen Hemminger <stephen@networkplumber.org> To: netdev@vger.kernel.org Cc: Stephen Hemminger <sthemmin@microsoft.com>, Stephen Hemminger <stephen@networkplumber.org> Subject: [PATCH v2 iproute2-next 07/31] tc/red: use new JSON helpers Date: Tue, 10 Jul 2018 14:05:34 -0700 Message-Id: <20180710210558.20278-8-stephen@networkplumber.org> In-Reply-To: <20180710210558.20278-1-stephen@networkplumber.org> References: <20180710210558.20278-1-stephen@networkplumber.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk
Series	tc use JSON in all qdisc \| expand [v2,iproute2-next,00/31] tc use JSON in all qdisc [v2,iproute2-next,01/31] tc: use JSON in error handling [v2,iproute2-next,02/31] tc: use const char in util [v2,iproute2-next,03/31] tc: convert stats print to json [v2,iproute2-next,04/31] tc/cbq: use sprint_rate [v2,iproute2-next,05/31] tc/util: remove unused print functions [v2,iproute2-next,06/31] tc/util: add print helpers for JSON [v2,iproute2-next,07/31] tc/red: use new JSON helpers [v2,iproute2-next,08/31] tc/sfq: add json support [v2,iproute2-next,09/31] tc/fq: support JSON output [v2,iproute2-next,10/31] tc/mqprio: implement JSON output [v2,iproute2-next,11/31] tc/drr: implement JSON output [v2,iproute2-next,12/31] tc/rr: implement JSON output [v2,iproute2-next,13/31] tc/qfq: implement JSON [v2,iproute2-next,14/31] tc/sfb: implement JSON output [v2,iproute2-next,15/31] tc/multiq: implement JSON output [v2,iproute2-next,16/31] tc/util: allow signed value for time [v2,iproute2-next,17/31] tc/codel: implement JSON output [v2,iproute2-next,18/31] tc/fifo: implement JSON output [v2,iproute2-next,19/31] tc/tbf: implement JSON output format [v2,iproute2-next,20/31] tc/choke: implement JSON output [v2,iproute2-next,21/31] tc/hhf: implement JSON output [v2,iproute2-next,22/31] tc/pie: implement JSON output [v2,iproute2-next,23/31] tc/gred: implement JSON output [v2,iproute2-next,24/31] tc/netem: implement JSON output [v2,iproute2-next,25/31] tc/dsmark: implement JSON output [v2,iproute2-next,26/31] tc/cbs: convert to JSON output [v2,iproute2-next,27/31] tc/cbq: convert to JSON output [v2,iproute2-next,28/31] tc/atm: convert to JSON output [v2,iproute2-next,29/31] tc/hfsc: convert to JSON output [v2,iproute2-next,30/31] tc/htb: implement JSON output [v2,iproute2-next,31/31] tc/fq_codel: use JSON helpers

Message ID

20180710210558.20278-8-stephen@networkplumber.org

State

Changes Requested, archived

Delegated to:

David Ahern

Headers

From: Stephen Hemminger <stephen@networkplumber.org>
To: netdev@vger.kernel.org
Cc: Stephen Hemminger <sthemmin@microsoft.com>,
	Stephen Hemminger <stephen@networkplumber.org>
Subject: [PATCH v2 iproute2-next 07/31] tc/red: use new JSON helpers
Date: Tue, 10 Jul 2018 14:05:34 -0700
Message-Id: <20180710210558.20278-8-stephen@networkplumber.org>
In-Reply-To: <20180710210558.20278-1-stephen@networkplumber.org>
References: <20180710210558.20278-1-stephen@networkplumber.org>
Sender: netdev-owner@vger.kernel.org
Precedence: bulk

Series

tc use JSON in all qdisc | expand

Commit Message

Stephen Hemminger July 10, 2018, 9:05 p.m. UTC

From: Stephen Hemminger <sthemmin@microsoft.com>

Now have simplier way to print size.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
 tc/q_red.c | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/tc/q_red.c b/tc/q_red.c
index 49fd4ac80513..9e4124befdb7 100644
--- a/tc/q_red.c
+++ b/tc/q_red.c
@@ -163,10 +163,6 @@  static int red_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt)
 	struct tc_red_qopt *qopt;
 	__u32 max_P = 0;
 
-	SPRINT_BUF(b1);
-	SPRINT_BUF(b2);
-	SPRINT_BUF(b3);
-
 	if (opt == NULL)
 		return 0;
 
@@ -182,12 +178,9 @@  static int red_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt)
 	    RTA_PAYLOAD(tb[TCA_RED_MAX_P]) >= sizeof(__u32))
 		max_P = rta_getattr_u32(tb[TCA_RED_MAX_P]);
 
-	print_uint(PRINT_JSON, "limit", NULL, qopt->limit);
-	print_string(PRINT_FP, NULL, "limit %s ", sprint_size(qopt->limit, b1));
-	print_uint(PRINT_JSON, "min", NULL, qopt->qth_min);
-	print_string(PRINT_FP, NULL, "min %s ", sprint_size(qopt->qth_min, b2));
-	print_uint(PRINT_JSON, "max", NULL, qopt->qth_max);
-	print_string(PRINT_FP, NULL, "max %s ", sprint_size(qopt->qth_max, b3));
+	print_size("limit", "limit %s ", qopt->limit);
+	print_size("min", "min %s ", qopt->qth_min);
+	print_size("max", "max %s ", qopt->qth_max);
 
 	if (qopt->flags & TC_RED_ECN)
 		print_bool(PRINT_ANY, "ecn", "ecn ", true);

[v2,iproute2-next,07/31] tc/red: use new JSON helpers

Commit Message

Patch