lib: Move print_rate() from tc here; modernize

[mirror_iproute2.git] / tc / q_cake.c

diff --git a/tc/q_cake.c b/tc/q_cake.c
index bf116e80316ca4f78553fcd6aaf77bf015ef7fee..ab9233a04f3904a3d202323609db03e4141c20f2 100644 (file)
--- a/tc/q_cake.c
+++ b/tc/q_cake.c
@@ -445,11 +445,10 @@ static int cake_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt)
        if (tb[TCA_CAKE_BASE_RATE64] &&
            RTA_PAYLOAD(tb[TCA_CAKE_BASE_RATE64]) >= sizeof(bandwidth)) {
                bandwidth = rta_getattr_u64(tb[TCA_CAKE_BASE_RATE64]);
-               if (bandwidth) {
-                       print_uint(PRINT_JSON, "bandwidth", NULL, bandwidth);
-                       print_string(PRINT_FP, NULL, "bandwidth %s ",
-                                    sprint_rate(bandwidth, b1));
-               } else
+               if (bandwidth)
+                       tc_print_rate(PRINT_ANY, "bandwidth", "bandwidth %s ",
+                                     bandwidth);
+               else
                        print_string(PRINT_ANY, "bandwidth", "bandwidth %s ",
                                     "unlimited");
        }
@@ -650,12 +649,10 @@ static int cake_print_xstats(struct qdisc_util *qu, FILE *f,
                        GET_STAT_U32(MEMORY_LIMIT));
        }
 
-       if (st[TCA_CAKE_STATS_CAPACITY_ESTIMATE64]) {
-               print_string(PRINT_FP, NULL, " capacity estimate: %s\n",
-                       sprint_rate(GET_STAT_U64(CAPACITY_ESTIMATE64), b1));
-               print_uint(PRINT_JSON, "capacity_estimate", NULL,
-                       GET_STAT_U64(CAPACITY_ESTIMATE64));
-       }
+       if (st[TCA_CAKE_STATS_CAPACITY_ESTIMATE64])
+               tc_print_rate(PRINT_ANY, "capacity_estimate",
+                             " capacity estimate: %s\n",
+                             GET_STAT_U64(CAPACITY_ESTIMATE64));
 
        if (st[TCA_CAKE_STATS_MIN_NETLEN] &&
            st[TCA_CAKE_STATS_MAX_NETLEN]) {
@@ -790,7 +787,14 @@ static int cake_print_xstats(struct qdisc_util *qu, FILE *f,
 #define PRINT_TSTAT_U64(name, attr)    PRINT_TSTAT(                    \
                        name, attr, "llu", rta_getattr_u64(GET_TSTAT(i, attr)))
 
-               SPRINT_TSTAT(rate, u64, "  thresh  ", THRESHOLD_RATE64);
+               if (GET_TSTAT(0, THRESHOLD_RATE64)) {
+                       fprintf(f, "  thresh  ");
+                       for (i = 0; i < num_tins; i++)
+                               tc_print_rate(PRINT_FP, NULL, " %12s",
+                                             rta_getattr_u64(GET_TSTAT(i, THRESHOLD_RATE64)));
+                       fprintf(f, "%s", _SL_);
+               }
+
                SPRINT_TSTAT(time, u32, "  target  ", TARGET_US);
                SPRINT_TSTAT(time, u32, "  interval", INTERVAL_US);
                SPRINT_TSTAT(time, u32, "  pk_delay", PEAK_DELAY_US);