matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Display rates ad mutiple of 1000 not 1024 

(Logical change 1.22)
This commit is contained in:
osdl.org!shemminger 2004-06-09 21:29:27 +00:00
parent 26bfe4393c
commit 4703e08a93
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
tc/tc_util.c
View File

@ -97,7 +97,10 @@ char * sprint_tc_classid(__u32 h, char *buf)
return buf; return buf;
} }
/*
* NB: rates are in Kilo = 1000 but sizes are in Kilo = 1024
* according to standard usage.
*/
int get_rate(unsigned *rate, const char *str) int get_rate(unsigned *rate, const char *str)
{ {
char *p; char *p;
@ -108,17 +111,17 @@ int get_rate(unsigned *rate, const char *str)
if (*p) { if (*p) {
if (strcasecmp(p, "kbps") == 0) if (strcasecmp(p, "kbps") == 0)
bps *= 1024; bps *= 1000;
else if (strcasecmp(p, "gbps") == 0) else if (strcasecmp(p, "gbps") == 0)
bps *= 1024*1024*1024; bps *= 1000000000.;
else if (strcasecmp(p, "gbit") == 0) else if (strcasecmp(p, "gbit") == 0)
bps *= 1024*1024*1024/8; bps = (bps * 1000000000.)/8;
else if (strcasecmp(p, "mbps") == 0) else if (strcasecmp(p, "mbps") == 0)
bps *= 1024*1024; bps *= 1000000.;
else if (strcasecmp(p, "mbit") == 0) else if (strcasecmp(p, "mbit") == 0)
bps *= 1024*1024/8; bps = (bps * 1000000.)/8;
else if (strcasecmp(p, "kbit") == 0) else if (strcasecmp(p, "kbit") == 0)
bps *= 1024/8; bps = (bps * 1000.) / 8;
else if (strcasecmp(p, "bps") != 0) else if (strcasecmp(p, "bps") != 0)
return -1; return -1;
} else } else
@ -162,10 +165,10 @@ int print_rate(char *buf, int len, __u32 rate)
{ {
double tmp = (double)rate*8; double tmp = (double)rate*8;
if (tmp >= 1024*1023 && fabs(1024*1024*rint(tmp/(1024*1024)) - tmp) < 1024) if (tmp >= 999999 && fabs(1000000.*rint(tmp/1000000.) - tmp) < 1000)
snprintf(buf, len, "%gMbit", rint(tmp/(1024*1024))); snprintf(buf, len, "%gMbit", rint(tmp/1000000.));
else if (tmp >= 1024-16 && fabs(1024*rint(tmp/1024) - tmp) < 16) else if (tmp >= 990 && fabs(1000.*rint(tmp/1000.) - tmp) < 10)
snprintf(buf, len, "%gKbit", rint(tmp/1024)); snprintf(buf, len, "%gKbit", rint(tmp/1000.));
else else
snprintf(buf, len, "%ubps", rate); snprintf(buf, len, "%ubps", rate);
return 0; return 0;