[hackers] [slstatus] swap_*: Port to OpenBSD || Aaron Marcher

From: <git_AT_suckless.org>
Date: Sun, 6 May 2018 01:21:28 +0200 (CEST)

commit efb41724b5499bf61ab65ff65908d686e59ecdc0
Author: Aaron Marcher <me_AT_drkhsh.at>
AuthorDate: Sun May 6 01:20:46 2018 +0200
Commit: Aaron Marcher <me_AT_drkhsh.at>
CommitDate: Sun May 6 01:20:46 2018 +0200

    swap_*: Port to OpenBSD

diff --git a/README b/README
index c0977aa..0961030 100644
--- a/README
+++ b/README
_AT_@ -64,4 +64,3 @@ The following functions are not portable at the moment:
 - wifi_{perc,essid}
 - cpu_{perc,iowait}
 - entropy
-- swap_{free,perc,total,used}
diff --git a/components/swap.c b/components/swap.c
index fe779db..f6f8993 100644
--- a/components/swap.c
+++ b/components/swap.c
_AT_@ -1,11 +1,11 @@
 /* See LICENSE file for copyright and license details. */
-#if defined(__linux__)
- #include <errno.h>
- #include <stdio.h>
- #include <string.h>
+#include <errno.h>
+#include <stdio.h>
+#include <string.h>
 
- #include "../util.h"
+#include "../util.h"
 
+#if defined(__linux__)
         static size_t
         pread(const char *path, char *buf, size_t bufsiz)
         {
_AT_@ -118,5 +118,83 @@
                 return bprintf("%f", (float)(total - free - cached) / 1024 / 1024);
         }
 #elif defined(__OpenBSD__)
- /* unimplemented */
+ #include <stdlib.h>
+ #include <sys/param.h> /* dbtob */
+ #include <sys/swap.h>
+ #include <sys/types.h>
+ #include <unistd.h>
+
+ #define dbtoqb(b) dbtob((int64_t)(b))
+
+ static void
+ 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");
+
+ *total = 0;
+ *used = 0;
+
+ for (i = 0; i < rnswap; i++) {
+ *total += dbtoqb(sep->se_nblks);
+ *used += dbtoqb(sep->se_inuse);
+ }
+
+ free(fsep);
+ }
+
+ const char *
+ swap_free(void)
+ {
+ int total, used;
+
+ getstats(&total, &used);
+
+ return bprintf("%f", (float)(total - used) / 1024 / 1024 / 1024);
+ }
+
+ const char *
+ swap_perc(void)
+ {
+ int total, used;
+
+ getstats(&total, &used);
+
+ return bprintf("%d", 100 * used / total);
+ }
+
+ const char *
+ swap_total(void)
+ {
+ int total, used;
+
+ getstats(&total, &used);
+
+ return bprintf("%f", (float)total / 1024 / 1024 / 1024);
+ }
+
+ const char *
+ swap_used(void)
+ {
+ int total, used;
+
+ getstats(&total, &used);
+
+ return bprintf("%f", (float)used / 1024 / 1024 / 1024);
+ }
 #endif
Received on Sun May 06 2018 - 01:21:28 CEST

This archive was generated by hypermail 2.3.0 : Sun May 06 2018 - 01:24:24 CEST