netdev - [PATCH] print_rate: use knowledge in rate_suffix table for human readable rates.

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <1362885998-14292-1-git-send-email-j.vimal@gmail.com>
Date:	Sat,  9 Mar 2013 19:26:38 -0800
From:	Vimalkumar <j.vimal@...il.com>
To:	netdev@...r.kernel.org, shemminger@...tta.com,
	eric.dumazet@...il.com
Cc:	Vimalkumar <j.vimal@...il.com>
Subject: [PATCH] print_rate: use knowledge in rate_suffix table for human readable rates.


Signed-off-by: Vimalkumar <j.vimal@...il.com>
---
 tc/tc_util.c |   26 ++++++++++++--------------
 1 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/tc/tc_util.c b/tc/tc_util.c
index 0939536..6e68d87 100644
--- a/tc/tc_util.c
+++ b/tc/tc_util.c
@@ -139,7 +139,8 @@ static const struct rate_suffix {
 	{ "GBps",	8000000000. },
 	{ "TiBps",	8.*1024.*1024.*1024.*1024. },
 	{ "TBps",	8000000000000. },
-	{ NULL }
+	{ NULL },
+	{ NULL },
 };
 
 
@@ -171,21 +172,18 @@ void print_rate(char *buf, int len, __u64 rate)
 {
 	double tmp = (double)rate*8;
 	extern int use_iec;
+	int start = 0;
+	const struct rate_suffix *s;
 
 	if (use_iec) {
-		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*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);
+		start = 1;
+	}
+
+	snprintf(buf, len, "%.0fbit", tmp);
+	for (s = &suffixes[start]; s->name; s += 2) {
+		if (tmp >= s->scale) {
+			snprintf(buf, len, "%.3f%s", tmp / s->scale, s->name);
+		}
 	}
 }
 
-- 
1.7.5.3

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html