em/slstatus
1
0
Fork 0
Code Releases Activity

Merge fmt_human_2 and fmt_human_10 to one function

Browse Source 
Now only one function, fmt_human, takes an additional argument "base".
This commit is contained in:
Aaron Marcher
2018-05-21 14:44:21 +02:00
parent fc0dde5a60
commit 10dbc9543e
7 changed files with 44 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/cpu.c
View File

@@ -20,7 +20,7 @@
return NULL; return NULL;
} }
return fmt_human_10(freq * 1000); return fmt_human(freq * 1000, 1000);
} }
const char * const char *
@@ -67,7 +67,7 @@
return NULL; return NULL;
} }
return fmt_human_10((size_t)freq * 1000 * 1000); return fmt_human((size_t)freq * 1000 * 1000, 1000);
} }
const char * const char *

6
components/disk.c
View File

@@ -16,7 +16,7 @@ disk_free(const char *mnt)
return NULL; return NULL;
} }
return fmt_human_2(fs.f_frsize * fs.f_bavail); return fmt_human(fs.f_frsize * fs.f_bavail, 1024);
} }
const char * const char *
@@ -43,7 +43,7 @@ disk_total(const char *mnt)
return NULL; return NULL;
} }
return fmt_human_2(fs.f_frsize * fs.f_blocks); return fmt_human(fs.f_frsize * fs.f_blocks, 1024);
} }
const char * const char *
@@ -56,5 +56,5 @@ disk_used(const char *mnt)
return NULL; return NULL;
} }
return fmt_human_2(fs.f_frsize * (fs.f_blocks - fs.f_bfree)); return fmt_human(fs.f_frsize * (fs.f_blocks - fs.f_bfree), 1024);
} }

12
components/netspeeds.c
View File

@@ -29,7 +29,8 @@
return NULL; return NULL;
} }
return fmt_human_2((rxbytes - oldrxbytes) * 1000 / interval); return fmt_human((rxbytes - oldrxbytes) * 1000 / interval,
1024);
} }
const char * const char *
@@ -54,7 +55,8 @@
return NULL; return NULL;
} }
return fmt_human_2((txbytes - oldtxbytes) * 1000 / interval); return fmt_human((txbytes - oldtxbytes) * 1000 / interval,
1024);
} }
#elif defined(__OpenBSD__) #elif defined(__OpenBSD__)
#include <string.h> #include <string.h>
@@ -95,7 +97,8 @@
return NULL; return NULL;
} }
return fmt_human_2((rxbytes - oldrxbytes) * 1000 / interval); return fmt_human((rxbytes - oldrxbytes) * 1000 / interval,
1024);
} }
const char * const char *
@@ -130,6 +133,7 @@
return NULL; return NULL;
} }
return fmt_human_2((txbytes - oldtxbytes) * 1000 / interval); return fmt_human_2((txbytes - oldtxbytes) * 1000 / interval,
1024);
} }
#endif #endif

21
components/ram.c
View File

@@ -17,7 +17,7 @@
return NULL; return NULL;
} }
return fmt_human_2(free * 1024); return fmt_human(free * 1024, 1024);
} }
const char * const char *
@@ -48,7 +48,7 @@
return NULL; return NULL;
} }
return fmt_human_2(total * 1024); return fmt_human(total * 1024, 1024);
} }
const char * const char *
@@ -65,7 +65,8 @@
return NULL; return NULL;
} }
return fmt_human_2((total - free - buffers - cached) * 1024); return fmt_human((total - free - buffers - cached) * 1024,
1024);
} }
#elif defined(__OpenBSD__) #elif defined(__OpenBSD__)
#include <stdlib.h> #include <stdlib.h>
@@ -99,8 +100,8 @@
if (load_uvmexp(&uvmexp)) { if (load_uvmexp(&uvmexp)) {
free_pages = uvmexp.npages - uvmexp.active; free_pages = uvmexp.npages - uvmexp.active;
return fmt_human_2(pagetok(free_pages, return fmt_human(pagetok(free_pages, uvmexp.pageshift) *
uvmexp.pageshift) * 1024); 1024, 1024);
} }
return NULL; return NULL;
@@ -126,8 +127,9 @@
struct uvmexp uvmexp; struct uvmexp uvmexp;
if (load_uvmexp(&uvmexp)) { if (load_uvmexp(&uvmexp)) {
return fmt_human_2(pagetok(uvmexp.npages, return fmt_human(pagetok(uvmexp.npages,
uvmexp.pageshift) * 1024); uvmexp.pageshift) * 1024,
1024);
} }
return NULL; return NULL;
@@ -139,8 +141,9 @@
struct uvmexp uvmexp; struct uvmexp uvmexp;
if (load_uvmexp(&uvmexp)) { if (load_uvmexp(&uvmexp)) {
return fmt_human_2(pagetok(uvmexp.active, return fmt_human(pagetok(uvmexp.active,
uvmexp.pageshift) * 1024); uvmexp.pageshift) * 1024,
1024);
} }
return NULL; return NULL;

12
components/swap.c
View File

@@ -48,7 +48,7 @@
} }
sscanf(match, "SwapFree: %ld kB\n", &free); sscanf(match, "SwapFree: %ld kB\n", &free);
return fmt_human_2(free * 1024); return fmt_human(free * 1024, 1024);
} }
const char * const char *
@@ -98,7 +98,7 @@
} }
sscanf(match, "SwapTotal: %ld kB\n", &total); sscanf(match, "SwapTotal: %ld kB\n", &total);
return fmt_human_2(total * 1024); return fmt_human(total * 1024, 1024);
} }
const char * const char *
@@ -126,7 +126,7 @@
} }
sscanf(match, "SwapFree: %ld kB\n", &free); sscanf(match, "SwapFree: %ld kB\n", &free);
return fmt_human_2((total - free - cached) * 1024); return fmt_human((total - free - cached) * 1024, 1024);
} }
#elif defined(__OpenBSD__) #elif defined(__OpenBSD__)
#include <stdlib.h> #include <stdlib.h>
@@ -178,7 +178,7 @@
getstats(&total, &used); getstats(&total, &used);
return fmt_human_2((total - used) * 1024); return fmt_human((total - used) * 1024, 1024);
} }
const char * const char *
@@ -202,7 +202,7 @@
getstats(&total, &used); getstats(&total, &used);
return fmt_human_2(total * 1024); return fmt_human(total * 1024, 1024);
} }
const char * const char *
@@ -212,6 +212,6 @@
getstats(&total, &used); getstats(&total, &used);
return fmt_human_2(used * 1024); return fmt_human(used * 1024, 1024);
} }
#endif #endif

32
util.c
View File

@@ -87,32 +87,24 @@ bprintf(const char *fmt, ...)
} }
const char * const char *
fmt_human_2(size_t num) fmt_human(size_t num, int base)
{ {
size_t i; size_t i;
double scaled; double scaled;
const char *prefix[] = { "", "Ki", "Mi", "Gi", "Ti", "Pi", "Ei", const char *siprefix[] = { "", "k", "M", "G", "T", "P", "E", "Z", "Y" };
"Zi", "Yi" }; const char *iecprefix[] = { "", "Ki", "Mi", "Gi", "Ti", "Pi", "Ei",
"Zi", "Yi" };
char *prefix[9];
if (base == 1000) {
memcpy(prefix, siprefix, sizeof(prefix));
} else if (base == 1024) {
memcpy(prefix, iecprefix, sizeof(prefix));
}
scaled = num; scaled = num;
for (i = 0; i < LEN(prefix) && scaled >= 1024; i++) { for (i = 0; i < LEN(prefix) && scaled >= 1024; i++) {
scaled /= 1024.0; scaled /= base;
}
return bprintf("%.1f%s", scaled, prefix[i]);
}
const char *
fmt_human_10(size_t num)
{
size_t i;
double scaled;
const char *prefix[] = { "", "K", "M", "G", "T", "P", "E",
"Z", "Y" };
scaled = num;
for (i = 0; i < LEN(prefix) && scaled >= 1000; i++) {
scaled /= 1000.0;
} }
return bprintf("%.1f%s", scaled, prefix[i]); return bprintf("%.1f%s", scaled, prefix[i]);

3
util.h
View File

@@ -10,6 +10,5 @@ void die(const char *, ...);
int esnprintf(char *str, size_t size, const char *fmt, ...); int esnprintf(char *str, size_t size, const char *fmt, ...);
const char *bprintf(const char *fmt, ...); const char *bprintf(const char *fmt, ...);
const char *fmt_human_2(size_t num); const char *fmt_human(size_t num, int iec);
const char *fmt_human_10(size_t num);
int pscanf(const char *path, const char *fmt, ...); int pscanf(const char *path, const char *fmt, ...);