Xinqi Bao's Git

projects / slstatus.git / blobdiff
summary | log | commit | diff | tree
raw | inline | side by side
Flush the output stream instead of arbitrarily disabling buffering
[slstatus.git] / components / swap.c
diff --git a/components/swap.c b/components/swap.c
index f6f8993..9bd599a 100644 (file)
--- a/components/swap.c
+++ b/components/swap.c
@@ -1,78 +1,84 @@
 /* See LICENSE file for copyright and license details. */
 #include <errno.h>
 /* See LICENSE file for copyright and license details. */
 #include <errno.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include "../util.h"
 
 #if defined(__linux__)
 #include <string.h>
 
 #include "../util.h"
 
 #if defined(__linux__)
-       static size_t
-       pread(const char *path, char *buf, size_t bufsiz)
+       static int
+       get_swap_info(long *s_total, long *s_free, long *s_cached)
        {
                FILE *fp;
        {
                FILE *fp;
-               size_t bytes_read;
-
-               if (!(fp = fopen(path, "r"))) {
-                       fprintf(stderr, "fopen '%s': %s\n", path,
-                               strerror(errno));
-                       return 0;
+               struct {
+                       const char *name;
+                       const size_t len;
+                       long *var;
+               } ent[] = {
+                       { "SwapTotal",  sizeof("SwapTotal") - 1,  s_total  },
+                       { "SwapFree",   sizeof("SwapFree") - 1,   s_free   },
+                       { "SwapCached", sizeof("SwapCached") - 1, s_cached },
+               };
+               size_t line_len = 0, i, left;
+               char *line = NULL;
+
+               /* get number of fields we want to extract */
+               for (i = 0, left = 0; i < LEN(ent); i++) {
+                       if (ent[i].var) {
+                               left++;
+                       }
                }
                }
-               if ((bytes_read = fread(buf, sizeof(char), bufsiz, fp)) == 0) {
-                       fprintf(stderr, "fread '%s': %s\n", path,
-                               strerror(errno));
-                       fclose(fp);
-                       return 0;
+
+               if (!(fp = fopen("/proc/meminfo", "r"))) {
+                       warn("fopen '/proc/meminfo':");
+                       return 1;
                }
                }
-               fclose(fp);
 
 
-               buf[bytes_read] = '\0';
+               /* read file line by line and extract field information */
+               while (left > 0 && getline(&line, &line_len, fp) >= 0) {
+                       for (i = 0; i < LEN(ent); i++) {
+                               if (ent[i].var &&
+                                   !strncmp(line, ent[i].name, ent[i].len)) {
+                                       sscanf(line + ent[i].len + 1, "%ld kB\n",
+                                              ent[i].var);
+                                       left--;
+                                       break;
+                               }
+                       }
+               }
+               free(line);
+               if (ferror(fp)) {
+                       warn("getline '/proc/meminfo':");
+                       return 1;
+               }
 
 
-               return bytes_read;
+               fclose(fp);
+               return 0;
        }
 
        const char *
        swap_free(void)
        {
        }
 
        const char *
        swap_free(void)
        {
-               long total, free;
-               char *match;
+               long free;
 
 
-               if (!pread("/proc/meminfo", buf, sizeof(buf) - 1)) {
+               if (get_swap_info(NULL, &free, NULL)) {
                        return NULL;
                }
 
                        return NULL;
                }
 
-               if ((match = strstr(buf, "SwapTotal")) == NULL)
-                       return NULL;
-               sscanf(match, "SwapTotal: %ld kB\n", &total);
-
-               if ((match = strstr(buf, "SwapFree")) == NULL)
-                       return NULL;
-               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;
-               char *match;
 
 
-               if (!pread("/proc/meminfo", buf, sizeof(buf) - 1)) {
+               if (get_swap_info(&total, &free, &cached) || total == 0) {
                        return NULL;
                }
 
                        return NULL;
                }
 
-               if ((match = strstr(buf, "SwapTotal")) == NULL)
-                       return NULL;
-               sscanf(match, "SwapTotal: %ld kB\n", &total);
-
-               if ((match = strstr(buf, "SwapCached")) == NULL)
-                       return NULL;
-               sscanf(match, "SwapCached: %ld kB\n", &cached);
-
-               if ((match = strstr(buf, "SwapFree")) == NULL)
-                       return NULL;
-               sscanf(match, "SwapFree: %ld kB\n", &free);
-
                return bprintf("%d", 100 * (total - free - cached) / total);
        }
 
                return bprintf("%d", 100 * (total - free - cached) / total);
        }
 
@@ -80,82 +86,65 @@
        swap_total(void)
        {
                long total;
        swap_total(void)
        {
                long total;
-               char *match;
 
 
-               if (!pread("/proc/meminfo", buf, sizeof(buf) - 1)) {
+               if (get_swap_info(&total, NULL, NULL)) {
                        return NULL;
                }
 
                        return NULL;
                }
 
-               if ((match = strstr(buf, "SwapTotal")) == NULL)
-                       return NULL;
-               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;
-               char *match;
 
 
-               if (!pread("/proc/meminfo", buf, sizeof(buf) - 1)) {
+               if (get_swap_info(&total, &free, &cached)) {
                        return NULL;
                }
 
                        return NULL;
                }
 
-               if ((match = strstr(buf, "SwapTotal")) == NULL)
-                       return NULL;
-               sscanf(match, "SwapTotal: %ld kB\n", &total);
-
-               if ((match = strstr(buf, "SwapCached")) == NULL)
-                       return NULL;
-               sscanf(match, "SwapCached: %ld kB\n", &cached);
-
-               if ((match = strstr(buf, "SwapFree")) == NULL)
-                       return NULL;
-               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__)
        #include <stdlib.h>
        }
 #elif defined(__OpenBSD__)
        #include <stdlib.h>
-       #include <sys/param.h> /* dbtob */
        #include <sys/swap.h>
        #include <sys/types.h>
        #include <unistd.h>
 
        #include <sys/swap.h>
        #include <sys/types.h>
        #include <unistd.h>
 
-       #define dbtoqb(b) dbtob((int64_t)(b))
-
-       static void
+       static int
        getstats(int *total, int *used)
        {
                struct swapent *sep, *fsep;
                int rnswap, nswap, i;
 
        getstats(int *total, int *used)
        {
                struct swapent *sep, *fsep;
                int rnswap, nswap, i;
 
-               nswap = swapctl(SWAP_NSWAP, 0, 0);
-               if (nswap < 1)
-                       fprintf(stderr, "swaptctl 'SWAP_NSWAP': %s\n", strerror(errno));
-
-               fsep = sep = calloc(nswap, sizeof(*sep));
-               if (sep == NULL)
-                       fprintf(stderr, "calloc 'nswap': %s\n", strerror(errno));
-
-               rnswap = swapctl(SWAP_STATS, (void *)sep, nswap);
-               if (rnswap < 0)
-                       fprintf(stderr, "swapctl 'SWAP_STATA': %s\n", strerror(errno));
-
-               if (nswap != rnswap)
-                       fprintf(stderr, "SWAP_STATS != SWAP_NSWAP\n");
+               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 = 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);
+
+               return 0;
        }
 
        const char *
        }
 
        const char *
@@ -163,9 +152,11 @@
        {
                int total, used;
 
        {
                int total, used;
 
-               getstats(&total, &used);
+               if (getstats(&total, &used)) {
+                       return NULL;
+               }
 
 
-               return bprintf("%f", (float)(total - used) / 1024 / 1024 / 1024);
+               return fmt_human((total - used) * 1024, 1024);
        }
 
        const char *
        }
 
        const char *
@@ -173,7 +164,13 @@
        {
                int total, used;
 
        {
                int total, used;
 
-               getstats(&total, &used);
+               if (getstats(&total, &used)) {
+                       return NULL;
+               }
+
+               if (total == 0) {
+                       return NULL;
+               }
 
                return bprintf("%d", 100 * used / total);
        }
 
                return bprintf("%d", 100 * used / total);
        }
@@ -183,9 +180,11 @@
        {
                int total, used;
 
        {
                int total, used;
 
-               getstats(&total, &used);
+               if (getstats(&total, &used)) {
+                       return NULL;
+               }
 
 
-               return bprintf("%f", (float)total / 1024 / 1024 / 1024);
+               return fmt_human(total * 1024, 1024);
        }
 
        const char *
        }
 
        const char *
@@ -193,8 +192,10 @@
        {
                int total, used;
 
        {
                int total, used;
 
-               getstats(&total, &used);
+               if (getstats(&total, &used)) {
+                       return NULL;
+               }
 
 
-               return bprintf("%f", (float)used / 1024 / 1024 / 1024);
+               return fmt_human(used * 1024, 1024);
        }
 #endif
        }
 #endif