Change to fmt_human in netspeeds on OpenBSD

[slstatus.git] / components / swap.c

diff --git a/components/swap.c b/components/swap.c
index 08a97de..37ee85c 100644 (file)
--- a/components/swap.c
+++ b/components/swap.c
@@ -1,82 +1,85 @@
 /* See LICENSE file for copyright and license details. */
 /* See LICENSE file for copyright and license details. */

+#include <errno.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "../util.h"
+

 #if defined(__linux__)
 #if defined(__linux__)

-       #include <errno.h>
-       #include <stdio.h>
-       #include <string.h>
+       static size_t
+       pread(const char *path, char *buf, size_t bufsiz)
+       {
+               FILE *fp;
+               size_t bytes_read;

 
 

-       #include "../util.h"
+               if (!(fp = fopen(path, "r"))) {
+                       warn("fopen '%s':", path);
+                       return 0;
+               }
+               if (!(bytes_read = fread(buf, sizeof(char), bufsiz, fp))) {
+                       warn("fread '%s':", path);
+                       fclose(fp);
+                       return 0;
+               }
+               fclose(fp);
+
+               buf[bytes_read] = '\0';
+
+               return bytes_read;
+       }

 
        const char *
        swap_free(void)
        {
                long total, free;
 
        const char *
        swap_free(void)
        {
                long total, free;

-               FILE *fp;
-               size_t bytes_read;

                char *match;
 
                char *match;
 

-               fp = fopen("/proc/meminfo", "r");
-               if (fp == NULL) {
-                       fprintf(stderr, "fopen '/proc/meminfo': %s\n",
-                               strerror(errno));
+               if (!pread("/proc/meminfo", buf, sizeof(buf) - 1)) {

                        return NULL;
                }
 
                        return NULL;
                }
 

-               if ((bytes_read = fread(buf, sizeof(char), sizeof(buf) - 1,
-                                       fp)) == 0) {
-                       fprintf(stderr, "fread '/proc/meminfo': %s\n",
-                               strerror(errno));
-                       fclose(fp);
+               if (!(match = strstr(buf, "SwapTotal"))) {

                        return NULL;
                }
                        return NULL;
                }

-               fclose(fp);
-
-               if ((match = strstr(buf, "SwapTotal")) == NULL)
-                       return NULL;

                sscanf(match, "SwapTotal: %ld kB\n", &total);
 
                sscanf(match, "SwapTotal: %ld kB\n", &total);
 

-               if ((match = strstr(buf, "SwapFree")) == NULL)
+               if (!(match = strstr(buf, "SwapFree"))) {

                        return NULL;
                        return NULL;

+               }

                sscanf(match, "SwapFree: %ld kB\n", &free);
 
                sscanf(match, "SwapFree: %ld kB\n", &free);
 

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

        }
 
        const char *
        swap_perc(void)
        {
                long total, free, cached;
        }
 
        const char *
        swap_perc(void)
        {
                long total, free, cached;

-               FILE *fp;
-               size_t bytes_read;

                char *match;
 
                char *match;
 

-               fp = fopen("/proc/meminfo", "r");
-               if (fp == NULL) {
-                       fprintf(stderr, "fopen '/proc/meminfo': %s\n",
-                               strerror(errno));
+               if (!pread("/proc/meminfo", buf, sizeof(buf) - 1)) {

                        return NULL;
                }
 
                        return NULL;
                }
 

-               if ((bytes_read = fread(buf, sizeof(char), sizeof(buf) - 1,
-                                       fp)) == 0) {
-                       fprintf(stderr, "fread '/proc/meminfo': %s\n",
-                               strerror(errno));
-                       fclose(fp);
+               if (!(match = strstr(buf, "SwapTotal"))) {

                        return NULL;
                }
                        return NULL;
                }

-               fclose(fp);
-
-               if ((match = strstr(buf, "SwapTotal")) == NULL)
-                       return NULL;

                sscanf(match, "SwapTotal: %ld kB\n", &total);
 
                sscanf(match, "SwapTotal: %ld kB\n", &total);
 

-               if ((match = strstr(buf, "SwapCached")) == NULL)
+               if (!(match = strstr(buf, "SwapCached"))) {

                        return NULL;
                        return NULL;

+               }

                sscanf(match, "SwapCached: %ld kB\n", &cached);
 
                sscanf(match, "SwapCached: %ld kB\n", &cached);
 

-               if ((match = strstr(buf, "SwapFree")) == NULL)
+               if (!(match = strstr(buf, "SwapFree"))) {

                        return NULL;
                        return NULL;

+               }

                sscanf(match, "SwapFree: %ld kB\n", &free);
 
                sscanf(match, "SwapFree: %ld kB\n", &free);
 

+               if (total == 0) {
+                       return NULL;
+               }
+

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


@@ -84,69 +87,139 @@
        swap_total(void)
        {
                long total;
        swap_total(void)
        {
                long total;

-               FILE *fp;
-               size_t bytes_read;

                char *match;
 
                char *match;
 

-               fp = fopen("/proc/meminfo", "r");
-               if (fp == NULL) {
-                       fprintf(stderr, "fopen '/proc/meminfo': %s\n",
-                               strerror(errno));
-                       return NULL;
-               }
-               if ((bytes_read = fread(buf, sizeof(char), sizeof(buf) - 1,
-                                       fp)) == 0) {
-                       fprintf(stderr, "fread '/proc/meminfo': %s\n",
-                               strerror(errno));
-                       fclose(fp);
+               if (!pread("/proc/meminfo", buf, sizeof(buf) - 1)) {

                        return NULL;
                }
                        return NULL;
                }

-               fclose(fp);

 
 

-               if ((match = strstr(buf, "SwapTotal")) == NULL)
+               if (!(match = strstr(buf, "SwapTotal"))) {

                        return NULL;
                        return NULL;

+               }

                sscanf(match, "SwapTotal: %ld kB\n", &total);
 
                sscanf(match, "SwapTotal: %ld kB\n", &total);
 

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

        }
 
        const char *
        swap_used(void)
        {
                long total, free, cached;
        }
 
        const char *
        swap_used(void)
        {
                long total, free, cached;

-               FILE *fp;
-               size_t bytes_read;

                char *match;
 
                char *match;
 

-               fp = fopen("/proc/meminfo", "r");
-               if (fp == NULL) {
-                       fprintf(stderr, "fopen '/proc/meminfo': %s\n",
-                               strerror(errno));
-                       return NULL;
-               }
-               if ((bytes_read = fread(buf, sizeof(char), sizeof(buf) - 1,
-                                       fp)) == 0) {
-                       fprintf(stderr, "fread '/proc/meminfo': %s\n",
-                               strerror(errno));
-                       fclose(fp);
+               if (!pread("/proc/meminfo", buf, sizeof(buf) - 1)) {

                        return NULL;
                }
                        return NULL;
                }

-               fclose(fp);

 
 

-               if ((match = strstr(buf, "SwapTotal")) == NULL)
+               if (!(match = strstr(buf, "SwapTotal"))) {

                        return NULL;
                        return NULL;

+               }

                sscanf(match, "SwapTotal: %ld kB\n", &total);
 
                sscanf(match, "SwapTotal: %ld kB\n", &total);
 

-               if ((match = strstr(buf, "SwapCached")) == NULL)
+               if (!(match = strstr(buf, "SwapCached"))) {

                        return NULL;
                        return NULL;

+               }

                sscanf(match, "SwapCached: %ld kB\n", &cached);
 
                sscanf(match, "SwapCached: %ld kB\n", &cached);
 

-               if ((match = strstr(buf, "SwapFree")) == NULL)
+               if (!(match = strstr(buf, "SwapFree"))) {

                        return NULL;
                        return NULL;

+               }

                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((total - free - cached) * 1024, 1024);

        }
 #elif defined(__OpenBSD__)
        }
 #elif defined(__OpenBSD__)

-       /* unimplemented */
+       #include <stdlib.h>
+       #include <sys/param.h> /* dbtob */
+       #include <sys/swap.h>
+       #include <sys/types.h>
+       #include <unistd.h>
+
+       static int
+       getstats(int *total, int *used)
+       {
+               struct swapent *sep, *fsep;
+               int rnswap, nswap, i;
+
+               if ((nswap = swapctl(SWAP_NSWAP, 0, 0)) < 1) {
+                       warn("swaptctl 'SWAP_NSWAP':");
+                       return 1;
+               }
+               if (!(fsep = sep = calloc(nswap, sizeof(*sep)))) {
+                       warn("calloc 'nswap':");
+                       return 1;
+               }
+               if ((rnswap = swapctl(SWAP_STATS, (void *)sep, nswap)) < 0) {
+                       warn("swapctl 'SWAP_STATA':");
+                       return 1;
+               }
+               if (nswap != rnswap) {
+                       warn("getstats: SWAP_STATS != SWAP_NSWAP");
+                       return 1;
+               }
+
+               *total = 0;
+               *used = 0;
+
+               for (i = 0; i < rnswap; i++) {
+                       *total += sep->se_nblks >> 1;
+                       *used += sep->se_inuse >> 1;
+               }
+
+               free(fsep);
+
+               return 0;
+       }
+
+       const char *
+       swap_free(void)
+       {
+               int total, used;
+
+               if (getstats(&total, &used)) {
+                       return NULL;
+               }
+
+               return fmt_human((total - used) * 1024, 1024);
+       }
+
+       const char *
+       swap_perc(void)
+       {
+               int total, used;
+
+               if (getstats(&total, &used)) {
+                       return NULL;
+               }
+
+               if (total == 0) {
+                       return NULL;
+               }
+
+               return bprintf("%d", 100 * used / total);
+       }
+
+       const char *
+       swap_total(void)
+       {
+               int total, used;
+
+               if (getstats(&total, &used)) {
+                       return NULL;
+               }
+
+               return fmt_human(total * 1024, 1024);
+       }
+
+       const char *
+       swap_used(void)
+       {
+               int total, used;
+
+               if (getstats(&total, &used)) {
+                       return NULL;
+               }
+
+               return fmt_human(used * 1024, 1024);
+       }

 #endif
 #endif