From mboxrd@z Thu Jan 1 00:00:00 1970 From: Roman Mashak Subject: [PATCH iproute2-next 1/1] tc: jsonify sample action Date: Sat, 31 Mar 2018 00:20:45 -0400 Message-ID: <1522470045-22397-1-git-send-email-mrv@mojatatu.com> Cc: stephen@networkplumber.org, netdev@vger.kernel.org, kernel@mojatatu.com, jhs@mojatatu.com, xiyou.wangcong@gmail.com, jiri@resnulli.us, Roman Mashak To: dsahern@gmail.com Return-path: Received: from mail-io0-f193.google.com ([209.85.223.193]:43185 "EHLO mail-io0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750718AbeCaEUw (ORCPT ); Sat, 31 Mar 2018 00:20:52 -0400 Received: by mail-io0-f193.google.com with SMTP id q84so12768678iod.10 for ; Fri, 30 Mar 2018 21:20:51 -0700 (PDT) Sender: netdev-owner@vger.kernel.org List-ID: Signed-off-by: Roman Mashak --- tc/m_sample.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/tc/m_sample.c b/tc/m_sample.c index 1e18c5154fe6..39a99246a8ea 100644 --- a/tc/m_sample.c +++ b/tc/m_sample.c @@ -149,23 +149,27 @@ static int print_sample(struct action_util *au, FILE *f, struct rtattr *arg) if (!tb[TCA_SAMPLE_PARMS] || !tb[TCA_SAMPLE_RATE] || !tb[TCA_SAMPLE_PSAMPLE_GROUP]) { - fprintf(f, "[NULL sample parameters]"); + print_string(PRINT_FP, NULL, "%s", "[NULL sample parameters]"); return -1; } p = RTA_DATA(tb[TCA_SAMPLE_PARMS]); - fprintf(f, "sample rate 1/%d group %d", - rta_getattr_u32(tb[TCA_SAMPLE_RATE]), - rta_getattr_u32(tb[TCA_SAMPLE_PSAMPLE_GROUP])); + print_string(PRINT_ANY, "kind", "%s ", "sample"); + print_uint(PRINT_ANY, "rate", "rate 1/%u ", + rta_getattr_u32(tb[TCA_SAMPLE_RATE])); + print_uint(PRINT_ANY, "group", "group %u", + rta_getattr_u32(tb[TCA_SAMPLE_PSAMPLE_GROUP])); if (tb[TCA_SAMPLE_TRUNC_SIZE]) - fprintf(f, " trunc_size %d", - rta_getattr_u32(tb[TCA_SAMPLE_TRUNC_SIZE])); + print_uint(PRINT_ANY, "trunc_size", " trunc_size %u", + rta_getattr_u32(tb[TCA_SAMPLE_TRUNC_SIZE])); print_action_control(f, " ", p->action, ""); - fprintf(f, "\n\tindex %d ref %d bind %d", p->index, p->refcnt, - p->bindcnt); + print_string(PRINT_FP, NULL, "%s", _SL_); + print_uint(PRINT_ANY, "index", "\t index %u", p->index); + print_int(PRINT_ANY, "ref", " ref %d", p->refcnt); + print_int(PRINT_ANY, "bind", " bind %d", p->bindcnt); if (show_stats) { if (tb[TCA_SAMPLE_TM]) { @@ -174,7 +178,7 @@ static int print_sample(struct action_util *au, FILE *f, struct rtattr *arg) print_tm(f, tm); } } - fprintf(f, "\n"); + print_string(PRINT_FP, NULL, "%s", _SL_); return 0; } -- 2.7.4