From 8cecdc283743ab2d25888f8dd39bd853e9e58a6c Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Thu, 21 Nov 2013 22:37:17 -0800 Subject: [PATCH] tc: more user friendly rates Display more user friendly rates. 10Mbit is more readable than 10000Kbit Before : class htb 1:2 root prio 0 rate 10000Kbit ceil 10000Kbit ... After: class htb 1:2 root prio 0 rate 10Mbit ceil 10Mbit ... Signed-off-by: Eric Dumazet --- tc/tc_util.c | 32 +++++++++++++------------------- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/tc/tc_util.c b/tc/tc_util.c index be3ed071..67f69486 100644 --- a/tc/tc_util.c +++ b/tc/tc_util.c @@ -173,28 +173,22 @@ int get_rate(unsigned *rate, const char *str) void print_rate(char *buf, int len, __u64 rate) { - double tmp = (double)rate*8; extern int use_iec; + unsigned long kilo = use_iec ? 1024 : 1000; + const char *str = use_iec ? "i" : ""; + int i = 0; + static char *units[5] = {"", "K", "M", "G", "T"}; - if (use_iec) { - if (tmp >= 1000.0*1024.0*1024.0*1024.0) - snprintf(buf, len, "%.0fGibit", tmp/(1024.0*1024.0*1024.0)); - else if (tmp >= 1000.0*1024.0*1024.0) - snprintf(buf, len, "%.0fMibit", tmp/(1024.0*1024.0)); - else if (tmp >= 1000.0*1024) - snprintf(buf, len, "%.0fKibit", tmp/1024); - else - snprintf(buf, len, "%.0fbit", tmp); - } else { - if (tmp >= 1000.0*1000000000.0) - snprintf(buf, len, "%.0fGbit", tmp/1000000000.0); - else if (tmp >= 1000.0*1000000.0) - snprintf(buf, len, "%.0fMbit", tmp/1000000.0); - else if (tmp >= 1000.0 * 1000.0) - snprintf(buf, len, "%.0fKbit", tmp/1000.0); - else - snprintf(buf, len, "%.0fbit", tmp); + rate <<= 3; /* bytes/sec -> bits/sec */ + + for (i = 0; i < ARRAY_SIZE(units); i++) { + if (rate < kilo) + break; + if (((rate % kilo) != 0) && rate < 1000*kilo) + break; + rate /= kilo; } + snprintf(buf, len, "%.0f%s%sbit", (double)rate, units[i], str); } char * sprint_rate(__u64 rate, char *buf)