Implement fmt_human_2() and fmt_human_10()

[slstatus.git] / components / swap.c

diff --git a/components/swap.c b/components/swap.c
index 031b713..c005691 100644 (file)
--- a/components/swap.c
+++ b/components/swap.c
@@ -13,11 +13,11 @@
                size_t bytes_read;
 
                if (!(fp = fopen(path, "r"))) {
                size_t bytes_read;
 
                if (!(fp = fopen(path, "r"))) {

-                       fprintf(stderr, "fopen '%s': %s\n", path, strerror(errno));
+                       warn("fopen '%s':", path);

                        return 0;
                }
                if (!(bytes_read = fread(buf, sizeof(char), bufsiz, fp))) {
                        return 0;
                }
                if (!(bytes_read = fread(buf, sizeof(char), bufsiz, fp))) {

-                       fprintf(stderr, "fread '%s': %s\n", path, strerror(errno));
+                       warn("fread '%s':", path);

                        fclose(fp);
                        return 0;
                }
                        fclose(fp);
                        return 0;
                }


@@ -48,7 +48,7 @@
                }
                sscanf(match, "SwapFree: %ld kB\n", &free);
 
                }
                sscanf(match, "SwapFree: %ld kB\n", &free);
 

-               return bprintf("%f", (float)free / 1024 / 1024);
+               return fmt_human_2(free * 1024, "B");

        }
 
        const char *
        }
 
        const char *


@@ -76,7 +76,7 @@
                }
                sscanf(match, "SwapFree: %ld kB\n", &free);
 
                }
                sscanf(match, "SwapFree: %ld kB\n", &free);
 

-               return bprintf("%d", 100 * (total - free - cached) / total);
+               return bprintf("%d%%", 100 * (total - free - cached) / total);

        }
 
        const char *
        }
 
        const char *


@@ -94,7 +94,7 @@
                }
                sscanf(match, "SwapTotal: %ld kB\n", &total);
 
                }
                sscanf(match, "SwapTotal: %ld kB\n", &total);
 

-               return bprintf("%f", (float)total / 1024 / 1024);
+               return fmt_human_2(total * 1024, "B");

        }
 
        const char *
        }
 
        const char *


@@ -122,7 +122,7 @@
                }
                sscanf(match, "SwapFree: %ld kB\n", &free);
 
                }
                sscanf(match, "SwapFree: %ld kB\n", &free);
 

-               return bprintf("%f", (float)(total - free - cached) / 1024 / 1024);
+               return fmt_human_2((total - free - cached) * 1024, "B");

        }
 #elif defined(__OpenBSD__)
        #include <stdlib.h>
        }
 #elif defined(__OpenBSD__)
        #include <stdlib.h>


@@ -131,8 +131,6 @@
        #include <sys/types.h>
        #include <unistd.h>
 
        #include <sys/types.h>
        #include <unistd.h>
 

-       #define dbtoqb(b) dbtob((int64_t)(b))
-

        static void
        getstats(int *total, int *used)
        {
        static void
        getstats(int *total, int *used)
        {


@@ -141,29 +139,29 @@
 
                nswap = swapctl(SWAP_NSWAP, 0, 0);
                if (nswap < 1) {
 
                nswap = swapctl(SWAP_NSWAP, 0, 0);
                if (nswap < 1) {

-                       fprintf(stderr, "swaptctl 'SWAP_NSWAP': %s\n", strerror(errno));
+                       warn("swaptctl 'SWAP_NSWAP':");

                }
 
                fsep = sep = calloc(nswap, sizeof(*sep));
                if (!sep) {
                }
 
                fsep = sep = calloc(nswap, sizeof(*sep));
                if (!sep) {

-                       fprintf(stderr, "calloc 'nswap': %s\n", strerror(errno));
+                       warn("calloc 'nswap':");

                }
 
                rnswap = swapctl(SWAP_STATS, (void *)sep, nswap);
                if (rnswap < 0) {
                }
 
                rnswap = swapctl(SWAP_STATS, (void *)sep, nswap);
                if (rnswap < 0) {

-                       fprintf(stderr, "swapctl 'SWAP_STATA': %s\n", strerror(errno));
+                       warn("swapctl 'SWAP_STATA':");

                }
 
                if (nswap != rnswap) {
                }
 
                if (nswap != rnswap) {

-                       fprintf(stderr, "SWAP_STATS != SWAP_NSWAP\n");
+                       warn("getstats: SWAP_STATS != SWAP_NSWAP");

                }
 
                *total = 0;
                *used = 0;
 
                for (i = 0; i < rnswap; i++) {
                }
 
                *total = 0;
                *used = 0;
 
                for (i = 0; i < rnswap; i++) {

-                       *total += dbtoqb(sep->se_nblks);
-                       *used += dbtoqb(sep->se_inuse);
+                       *total += sep->se_nblks >> 1;
+                       *used += sep->se_inuse >> 1;

                }
 
                free(fsep);
                }
 
                free(fsep);


@@ -176,7 +174,7 @@
 
                getstats(&total, &used);
 
 
                getstats(&total, &used);
 

-               return bprintf("%f", (float)(total - used) / 1024 / 1024 / 1024);
+               return fmt_human_2((total - used) * 1024, "B");

        }
 
        const char *
        }
 
        const char *


@@ -186,7 +184,7 @@
 
                getstats(&total, &used);
 
 
                getstats(&total, &used);
 

-               return bprintf("%d", 100 * used / total);
+               return bprintf("%d%%", 100 * used / total);

        }
 
        const char *
        }
 
        const char *


@@ -196,7 +194,7 @@
 
                getstats(&total, &used);
 
 
                getstats(&total, &used);
 

-               return bprintf("%f", (float)total / 1024 / 1024 / 1024);
+               return fmt_human_2(total * 1024, "B");

        }
 
        const char *
        }
 
        const char *


@@ -206,6 +204,6 @@
 
                getstats(&total, &used);
 
 
                getstats(&total, &used);
 

-               return bprintf("%f", (float)used / 1024 / 1024 / 1024);
+               return fmt_human_2(used * 1024, "B");

        }
 #endif
        }
 #endif