* [PATCH iproute2 v2 1/1] tc: action: fix time values output in JSON format
@ 2020-05-20 0:59 Roman Mashak
2020-05-20 4:20 ` Stephen Hemminger
0 siblings, 1 reply; 2+ messages in thread
From: Roman Mashak @ 2020-05-20 0:59 UTC (permalink / raw)
To: stephen
Cc: dsahern, netdev, kernel, jhs, xiyou.wangcong, jiri, Roman Mashak,
Jiri Pirko
Report tcf_t values in seconds, not jiffies, in JSON format as it is now
for stdout.
v2: use PRINT_ANY, drop the useless casts and fix the style (Stephen Hemminger)
Fixes: 2704bd625583 ("tc: jsonify actions core")
Cc: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: Roman Mashak <mrv@mojatatu.com>
---
tc/tc_util.c | 26 +++++++++++---------------
1 file changed, 11 insertions(+), 15 deletions(-)
diff --git a/tc/tc_util.c b/tc/tc_util.c
index 12f865cc71bf..fd5fcb242b64 100644
--- a/tc/tc_util.c
+++ b/tc/tc_util.c
@@ -750,21 +750,17 @@ void print_tm(FILE *f, const struct tcf_t *tm)
{
int hz = get_user_hz();
- if (tm->install != 0) {
- print_uint(PRINT_JSON, "installed", NULL, tm->install);
- print_uint(PRINT_FP, NULL, " installed %u sec",
- (unsigned int)(tm->install/hz));
- }
- if (tm->lastuse != 0) {
- print_uint(PRINT_JSON, "last_used", NULL, tm->lastuse);
- print_uint(PRINT_FP, NULL, " used %u sec",
- (unsigned int)(tm->lastuse/hz));
- }
- if (tm->expires != 0) {
- print_uint(PRINT_JSON, "expires", NULL, tm->expires);
- print_uint(PRINT_FP, NULL, " expires %u sec",
- (unsigned int)(tm->expires/hz));
- }
+ if (tm->install != 0)
+ print_uint(PRINT_ANY, "installed", " installed %u sec",
+ tm->install / hz);
+
+ if (tm->lastuse != 0)
+ print_uint(PRINT_ANY, "last_used", " used %u sec",
+ tm->lastuse / hz);
+
+ if (tm->expires != 0)
+ print_uint(PRINT_ANY, "expires", " expires %u sec",
+ tm->expires / hz);
}
static void print_tcstats_basic_hw(struct rtattr **tbs, char *prefix)
--
2.7.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH iproute2 v2 1/1] tc: action: fix time values output in JSON format
2020-05-20 0:59 [PATCH iproute2 v2 1/1] tc: action: fix time values output in JSON format Roman Mashak
@ 2020-05-20 4:20 ` Stephen Hemminger
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Hemminger @ 2020-05-20 4:20 UTC (permalink / raw)
To: Roman Mashak
Cc: dsahern, netdev, kernel, jhs, xiyou.wangcong, jiri, Jiri Pirko
On Tue, 19 May 2020 20:59:44 -0400
Roman Mashak <mrv@mojatatu.com> wrote:
> Report tcf_t values in seconds, not jiffies, in JSON format as it is now
> for stdout.
>
> v2: use PRINT_ANY, drop the useless casts and fix the style (Stephen Hemminger)
>
> Fixes: 2704bd625583 ("tc: jsonify actions core")
> Cc: Jiri Pirko <jiri@mellanox.com>
> Signed-off-by: Roman Mashak <mrv@mojatatu.com>
Applied thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-05-20 4:20 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-20 0:59 [PATCH iproute2 v2 1/1] tc: action: fix time values output in JSON format Roman Mashak
2020-05-20 4:20 ` Stephen Hemminger
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.