From 42edfea89a47cbf0623d1aaf5673a4e5ca79fb52 Mon Sep 17 00:00:00 2001
From: Laslo Hunhold <dev@frign.de>
Date: Tue, 1 May 2018 18:10:39 +0200
Subject: Revert component-split
this reverts the commits from 92ab9ef52ebcb097add97d9f78e67ad1c1d6a6ec up to
d42870d6ca7fb587b38f8cf6d6821ae33a53a696.
After heavy consideration, the component split has more disadvantages
than advantages, especially given there will be utility-functions
sharing quite a lot of code that would then need to be duplicated, as it
does not fit into the util.c due to its speciality.
One big advantage of the component-wise build is readability, and
without doubt, this was achieved here. This point will be addressed
with a different approach that will be visible in the upcoming commits.
One big disadvantage of the component build is the fact that it
introduces state to the build process which is not necessary. Before its
introduction, the only influencing factors where the system-defines
__linux__ and __OpenBSD__. With the components, we are also relying on
the output of uname(1).
Additionally, if the os.mk is not present, make gives the output
$ make
Makefile:5: os.mk: No such file or directory
make: *** No rule to make target 'os.mk'. Stop.
This could easily be fixed by providing some sort of meta-rule for this
file, however, it indicates the problem we have here, and this entire
statefulness will heavily complicate packaging of this tool and makes
the build process much more complex than it actually has to be.
---
components/Linux/battery.c | 58 ----------------
components/Linux/cpu.c | 64 ------------------
components/Linux/entropy.c | 13 ----
components/Linux/ram.c | 52 ---------------
components/Linux/swap.c | 136 --------------------------------------
components/Linux/temperature.c | 15 -----
components/Linux/uptime.c | 24 -------
components/Linux/wifi.c | 90 -------------------------
components/OpenBSD/battery.c | 32 ---------
components/OpenBSD/cpu.c | 26 --------
components/OpenBSD/entropy.c | 0
components/OpenBSD/ram.c | 77 ----------------------
components/OpenBSD/swap.c | 0
components/OpenBSD/temperature.c | 32 ---------
components/OpenBSD/uptime.c | 40 ------------
components/OpenBSD/wifi.c | 0
components/battery.c | 91 ++++++++++++++++++++++++++
components/cpu.c | 88 +++++++++++++++++++++++++
components/entropy.c | 15 +++++
components/ram.c | 129 ++++++++++++++++++++++++++++++++++++
components/swap.c | 138 +++++++++++++++++++++++++++++++++++++++
components/temperature.c | 45 +++++++++++++
components/uptime.c | 63 ++++++++++++++++++
components/wifi.c | 92 ++++++++++++++++++++++++++
24 files changed, 661 insertions(+), 659 deletions(-)
delete mode 100644 components/Linux/battery.c
delete mode 100644 components/Linux/cpu.c
delete mode 100644 components/Linux/entropy.c
delete mode 100644 components/Linux/ram.c
delete mode 100644 components/Linux/swap.c
delete mode 100644 components/Linux/temperature.c
delete mode 100644 components/Linux/uptime.c
delete mode 100644 components/Linux/wifi.c
delete mode 100644 components/OpenBSD/battery.c
delete mode 100644 components/OpenBSD/cpu.c
delete mode 100644 components/OpenBSD/entropy.c
delete mode 100644 components/OpenBSD/ram.c
delete mode 100644 components/OpenBSD/swap.c
delete mode 100644 components/OpenBSD/temperature.c
delete mode 100644 components/OpenBSD/uptime.c
delete mode 100644 components/OpenBSD/wifi.c
create mode 100644 components/battery.c
create mode 100644 components/cpu.c
create mode 100644 components/entropy.c
create mode 100644 components/ram.c
create mode 100644 components/swap.c
create mode 100644 components/temperature.c
create mode 100644 components/uptime.c
create mode 100644 components/wifi.c
(limited to 'components')
diff --git a/components/Linux/battery.c b/components/Linux/battery.c
deleted file mode 100644
index 654ddab..0000000
--- a/components/Linux/battery.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <limits.h>
-#include <string.h>
-
-#include "../../util.h"
-
-const char *
-battery_perc(const char *bat)
-{
- int perc;
- char path[PATH_MAX];
-
- snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/", bat, "/capacity");
- return (pscanf(path, "%i", &perc) == 1) ?
- bprintf("%d", perc) : NULL;
-}
-
-const char *
-battery_power(const char *bat)
-{
- int watts;
- char path[PATH_MAX];
-
- snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/", bat, "/power_now");
- return (pscanf(path, "%i", &watts) == 1) ?
- bprintf("%d", (watts + 500000) / 1000000) : NULL;
-}
-
-const char *
-battery_state(const char *bat)
-{
- struct {
- char *state;
- char *symbol;
- } map[] = {
- { "Charging", "+" },
- { "Discharging", "-" },
- { "Full", "=" },
- { "Unknown", "/" },
- };
- size_t i;
- char path[PATH_MAX], state[12];
-
- snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/", bat, "/status");
- if (pscanf(path, "%12s", state) != 1) {
- return NULL;
- }
-
- for (i = 0; i < LEN(map); i++) {
- if (!strcmp(map[i].state, state)) {
- break;
- }
- }
- return (i == LEN(map)) ? "?" : map[i].symbol;
-}
diff --git a/components/Linux/cpu.c b/components/Linux/cpu.c
deleted file mode 100644
index bfc204c..0000000
--- a/components/Linux/cpu.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "../../util.h"
-
-const char *
-cpu_freq(void)
-{
- int freq;
-
- return (pscanf("/sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq",
- "%i", &freq) == 1) ?
- bprintf("%d", (freq + 500) / 1000) : NULL;
-}
-
-const char *
-cpu_perc(void)
-{
- int perc;
- static long double a[7];
- static int valid;
- long double b[7];
-
- memcpy(b, a, sizeof(b));
- if (pscanf("/proc/stat", "%*s %Lf %Lf %Lf %Lf %Lf %Lf %Lf", &a[0], &a[1], &a[2],
- &a[3], &a[4], &a[5], &a[6]) != 7) {
- return NULL;
- }
- if (!valid) {
- valid = 1;
- return NULL;
- }
-
- perc = 100 * ((b[0]+b[1]+b[2]+b[5]+b[6]) - (a[0]+a[1]+a[2]+a[5]+a[6])) /
- ((b[0]+b[1]+b[2]+b[3]+b[4]+b[5]+b[6]) - (a[0]+a[1]+a[2]+a[3]+a[4]+a[5]+a[6]));
-
- return bprintf("%d", perc);
-}
-
-const char *
-cpu_iowait(void)
-{
- int perc;
- static int valid;
- static long double a[7];
- long double b[7];
-
- memcpy(b, a, sizeof(b));
- if (pscanf("/proc/stat", "%*s %Lf %Lf %Lf %Lf %Lf %Lf %Lf", &a[0], &a[1], &a[2],
- &a[3], &a[4], &a[5], &a[6]) != 7) {
- return NULL;
- }
- if (!valid) {
- valid = 1;
- return NULL;
- }
-
- perc = 100 * ((b[4]) - (a[4])) /
- ((b[0]+b[1]+b[2]+b[3]+b[4]+b[5]+b[6]) - (a[0]+a[1]+a[2]+a[3]+a[4]+a[5]+a[6]));
-
- return bprintf("%d", perc);
-}
diff --git a/components/Linux/entropy.c b/components/Linux/entropy.c
deleted file mode 100644
index 17be270..0000000
--- a/components/Linux/entropy.c
+++ /dev/null
@@ -1,13 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <stdio.h>
-
-#include "../../util.h"
-
-const char *
-entropy(void)
-{
- int num;
-
- return (pscanf("/proc/sys/kernel/random/entropy_avail", "%d", &num) == 1) ?
- bprintf("%d", num) : NULL;
-}
diff --git a/components/Linux/ram.c b/components/Linux/ram.c
deleted file mode 100644
index 7df5f85..0000000
--- a/components/Linux/ram.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <stdio.h>
-
-#include "../../util.h"
-
-const char *
-ram_free(void)
-{
- long free;
-
- return (pscanf("/proc/meminfo", "MemFree: %ld kB\n", &free) == 1) ?
- bprintf("%f", (float)free / 1024 / 1024) : NULL;
-}
-
-const char *
-ram_perc(void)
-{
- long total, free, buffers, cached;
-
- return (pscanf("/proc/meminfo",
- "MemTotal: %ld kB\n"
- "MemFree: %ld kB\n"
- "MemAvailable: %ld kB\nBuffers: %ld kB\n"
- "Cached: %ld kB\n",
- &total, &free, &buffers, &buffers, &cached) == 5) ?
- bprintf("%d", 100 * ((total - free) - (buffers + cached)) / total) :
- NULL;
-}
-
-const char *
-ram_total(void)
-{
- long total;
-
- return (pscanf("/proc/meminfo", "MemTotal: %ld kB\n", &total) == 1) ?
- bprintf("%f", (float)total / 1024 / 1024) : NULL;
-}
-
-const char *
-ram_used(void)
-{
- long total, free, buffers, cached;
-
- return (pscanf("/proc/meminfo",
- "MemTotal: %ld kB\n"
- "MemFree: %ld kB\n"
- "MemAvailable: %ld kB\nBuffers: %ld kB\n"
- "Cached: %ld kB\n",
- &total, &free, &buffers, &buffers, &cached) == 5) ?
- bprintf("%f", (float)(total - free - buffers - cached) / 1024 / 1024) :
- NULL;
-}
diff --git a/components/Linux/swap.c b/components/Linux/swap.c
deleted file mode 100644
index bce9d5a..0000000
--- a/components/Linux/swap.c
+++ /dev/null
@@ -1,136 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "../../util.h"
-
-const char *
-swap_free(void)
-{
- long total, free;
- FILE *fp;
- size_t bytes_read;
- 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);
- return NULL;
- }
- fclose(fp);
-
- 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);
-}
-
-const char *
-swap_perc(void)
-{
- long total, free, cached;
- FILE *fp;
- size_t bytes_read;
- 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);
- return NULL;
- }
- fclose(fp);
-
- 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);
-}
-
-const char *
-swap_total(void)
-{
- long total;
- FILE *fp;
- size_t bytes_read;
- 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);
- return NULL;
- }
- fclose(fp);
-
- if ((match = strstr(buf, "SwapTotal")) == NULL)
- return NULL;
- sscanf(match, "SwapTotal: %ld kB\n", &total);
-
- return bprintf("%f", (float)total / 1024 / 1024);
-}
-
-const char *
-swap_used(void)
-{
- long total, free, cached;
- FILE *fp;
- size_t bytes_read;
- 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);
- return NULL;
- }
- fclose(fp);
-
- 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);
-}
diff --git a/components/Linux/temperature.c b/components/Linux/temperature.c
deleted file mode 100644
index fa50826..0000000
--- a/components/Linux/temperature.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "../../util.h"
-
-const char *
-temp(const char *file)
-{
- int temp;
-
- return (pscanf(file, "%d", &temp) == 1) ?
- bprintf("%d", temp / 1000) : NULL;
-}
diff --git a/components/Linux/uptime.c b/components/Linux/uptime.c
deleted file mode 100644
index e7afc8e..0000000
--- a/components/Linux/uptime.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/sysinfo.h>
-
-#include "../../util.h"
-
-const char *
-uptime(void)
-{
- int h;
- int m;
- int uptime = 0;
- struct sysinfo info;
-
- sysinfo(&info);
- uptime = info.uptime;
-
- h = uptime / 3600;
- m = (uptime - h * 3600) / 60;
-
- return bprintf("%dh %dm", h, m);
-}
diff --git a/components/Linux/wifi.c b/components/Linux/wifi.c
deleted file mode 100644
index e86fcbc..0000000
--- a/components/Linux/wifi.c
+++ /dev/null
@@ -1,90 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <errno.h>
-#include <ifaddrs.h>
-#include <linux/wireless.h>
-#include <sys/socket.h>
-#include <stdio.h>
-#include <limits.h>
-#include <string.h>
-#include <sys/ioctl.h>
-#include <unistd.h>
-
-#include "../../util.h"
-
-const char *
-wifi_perc(const char *iface)
-{
- int i, cur;
- float perc;
- int total = 70; /* the max of /proc/net/wireless */
- char *p, *datastart;
- char path[PATH_MAX];
- char status[5];
- FILE *fp;
-
- snprintf(path, sizeof(path), "%s%s%s", "/sys/class/net/", iface, "/operstate");
- fp = fopen(path, "r");
- if (fp == NULL) {
- fprintf(stderr, "fopen '%s': %s\n", path, strerror(errno));
- return NULL;
- }
- p = fgets(status, 5, fp);
- fclose(fp);
- if(!p || strcmp(status, "up\n") != 0) {
- return NULL;
- }
-
- fp = fopen("/proc/net/wireless", "r");
- if (fp == NULL) {
- fprintf(stderr, "fopen '/proc/net/wireless': %s\n", strerror(errno));
- return NULL;
- }
-
- for (i = 0; i < 3; i++) {
- if (!(p = fgets(buf, sizeof(buf) - 1, fp)))
- break;
- }
- fclose(fp);
- if (i < 2 || !p)
- return NULL;
-
- if ((datastart = strstr(buf, iface)) == NULL)
- return NULL;
-
- datastart = (datastart+(strlen(iface)+1));
- sscanf(datastart + 1, " %*d %d %*d %*d %*d %*d %*d %*d %*d %*d", &cur);
-
- perc = (float)cur / total * 100.0;
-
- return bprintf("%.0f", perc);
-}
-
-const char *
-wifi_essid(const char *iface)
-{
- static char id[IW_ESSID_MAX_SIZE+1];
- int sockfd = socket(AF_INET, SOCK_DGRAM, 0);
- struct iwreq wreq;
-
- memset(&wreq, 0, sizeof(struct iwreq));
- wreq.u.essid.length = IW_ESSID_MAX_SIZE+1;
- snprintf(wreq.ifr_name, sizeof(wreq.ifr_name), "%s", iface);
-
- if (sockfd == -1) {
- fprintf(stderr, "socket 'AF_INET': %s\n", strerror(errno));
- return NULL;
- }
- wreq.u.essid.pointer = id;
- if (ioctl(sockfd,SIOCGIWESSID, &wreq) == -1) {
- fprintf(stderr, "ioctl 'SIOCGIWESSID': %s\n", strerror(errno));
- close(sockfd);
- return NULL;
- }
-
- close(sockfd);
-
- if (strcmp(id, "") == 0)
- return NULL;
- else
- return id;
-}
diff --git a/components/OpenBSD/battery.c b/components/OpenBSD/battery.c
deleted file mode 100644
index daefd77..0000000
--- a/components/OpenBSD/battery.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/ioctl.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <machine/apmvar.h>
-
-#include "../../util.h"
-
-const char *
-battery_perc(const char *null)
-{
- struct apm_power_info apm_info;
- int fd;
-
- fd = open("/dev/apm", O_RDONLY);
- if (fd < 0) {
- fprintf(stderr, "open '/dev/apm': %s\n", strerror(errno));
- return NULL;
- }
-
- if (ioctl(fd, APM_IOC_GETPOWER, &apm_info) < 0) {
- fprintf(stderr, "ioctl 'APM_IOC_GETPOWER': %s\n", strerror(errno));
- close(fd);
- return NULL;
- }
- close(fd);
-
- return bprintf("%d", apm_info.battery_life);
-}
diff --git a/components/OpenBSD/cpu.c b/components/OpenBSD/cpu.c
deleted file mode 100644
index 11f1812..0000000
--- a/components/OpenBSD/cpu.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/sysctl.h>
-
-#include "../../util.h"
-
-const char *
-cpu_freq(void)
-{
- int freq, mib[2];
- size_t size;
-
- mib[0] = CTL_HW;
- mib[1] = HW_CPUSPEED;
-
- size = sizeof(freq);
-
- if (sysctl(mib, 2, &freq, &size, NULL, 0) == -1) {
- fprintf(stderr, "sysctl 'HW_CPUSPEED': %s\n", strerror(errno));
- return NULL;
- }
-
- return bprintf("%d", freq);
-}
diff --git a/components/OpenBSD/entropy.c b/components/OpenBSD/entropy.c
deleted file mode 100644
index e69de29..0000000
diff --git a/components/OpenBSD/ram.c b/components/OpenBSD/ram.c
deleted file mode 100644
index f7c81d1..0000000
--- a/components/OpenBSD/ram.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/sysctl.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#include "../../util.h"
-
-inline int
-load_uvmexp(struct uvmexp *uvmexp)
-{
- int uvmexp_mib[] = {CTL_VM, VM_UVMEXP};
- size_t size;
-
- size = sizeof(*uvmexp);
-
- return sysctl(uvmexp_mib, 2, uvmexp, &size, NULL, 0) >= 0 ? 1 : 0;
-}
-
-const char *
-ram_free(void)
-{
- struct uvmexp uvmexp;
- float free;
- int free_pages;
-
- if (load_uvmexp(&uvmexp)) {
- free_pages = uvmexp.npages - uvmexp.active;
- free = (double) (free_pages * uvmexp.pagesize) / 1024 / 1024 / 1024;
- return bprintf("%f", free);
- }
-
- return NULL;
-}
-
-const char *
-ram_perc(void)
-{
- struct uvmexp uvmexp;
- int percent;
-
- if (load_uvmexp(&uvmexp)) {
- percent = uvmexp.active * 100 / uvmexp.npages;
- return bprintf("%d", percent);
- }
-
- return NULL;
-}
-
-const char *
-ram_total(void)
-{
- struct uvmexp uvmexp;
- float total;
-
- if (load_uvmexp(&uvmexp)) {
- total = (double) (uvmexp.npages * uvmexp.pagesize) / 1024 / 1024 / 1024;
- return bprintf("%f", total);
- }
-
- return NULL;
-}
-
-const char *
-ram_used(void)
-{
- struct uvmexp uvmexp;
- float used;
-
- if (load_uvmexp(&uvmexp)) {
- used = (double) (uvmexp.active * uvmexp.pagesize) / 1024 / 1024 / 1024;
- return bprintf("%f", used);
- }
-
- return NULL;
-}
diff --git a/components/OpenBSD/swap.c b/components/OpenBSD/swap.c
deleted file mode 100644
index e69de29..0000000
diff --git a/components/OpenBSD/temperature.c b/components/OpenBSD/temperature.c
deleted file mode 100644
index 8098868..0000000
--- a/components/OpenBSD/temperature.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/sysctl.h>
-#include <sys/time.h>
-#include <sys/sensors.h>
-
-#include "../../util.h"
-
-const char *
-temp(const char *null)
-{
- int mib[5];
- size_t size;
- struct sensor temp;
-
- mib[0] = CTL_HW;
- mib[1] = HW_SENSORS;
- mib[2] = 0; /* cpu0 */
- mib[3] = SENSOR_TEMP;
- mib[4] = 0; /* temp0 */
-
- size = sizeof(temp);
-
- if (sysctl(mib, 5, &temp, &size, NULL, 0) == -1) {
- fprintf(stderr, "sysctl 'SENSOR_TEMP': %s\n", strerror(errno));
- return NULL;
- }
-
- return bprintf("%d", (temp.value - 273150000) / 1000000); /* kelvin to celsius */
-}
diff --git a/components/OpenBSD/uptime.c b/components/OpenBSD/uptime.c
deleted file mode 100644
index 637e2e0..0000000
--- a/components/OpenBSD/uptime.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/sysctl.h>
-#include <sys/time.h>
-
-#include "../../util.h"
-
-const char *
-uptime(void)
-{
- int h;
- int m;
- int uptime = 0;
-
- int mib[2];
- size_t size;
- time_t now;
- struct timeval boottime;
-
- time(&now);
-
- mib[0] = CTL_KERN;
- mib[1] = KERN_BOOTTIME;
-
- size = sizeof(boottime);
-
- if (sysctl(mib, 2, &boottime, &size, NULL, 0) != -1)
- uptime = now - boottime.tv_sec;
- else {
- fprintf(stderr, "sysctl 'KERN_BOOTTIME': %s\n", strerror(errno));
- return NULL;
- }
-
- h = uptime / 3600;
- m = (uptime - h * 3600) / 60;
-
- return bprintf("%dh %dm", h, m);
-}
diff --git a/components/OpenBSD/wifi.c b/components/OpenBSD/wifi.c
deleted file mode 100644
index e69de29..0000000
diff --git a/components/battery.c b/components/battery.c
new file mode 100644
index 0000000..955d8ab
--- /dev/null
+++ b/components/battery.c
@@ -0,0 +1,91 @@
+/* See LICENSE file for copyright and license details. */
+#include <errno.h>
+#include <stdio.h>
+#include <string.h>
+#if defined(__linux__)
+#include <limits.h>
+#include <string.h>
+#elif defined(__OpenBSD__)
+#include <sys/ioctl.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <machine/apmvar.h>
+#endif
+
+#include "../util.h"
+
+#if defined(__linux__)
+const char *
+battery_perc(const char *bat)
+{
+ int perc;
+ char path[PATH_MAX];
+
+ snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/", bat, "/capacity");
+ return (pscanf(path, "%i", &perc) == 1) ?
+ bprintf("%d", perc) : NULL;
+}
+#elif defined(__OpenBSD__)
+const char *
+battery_perc(const char *null)
+{
+ struct apm_power_info apm_info;
+ int fd;
+
+ fd = open("/dev/apm", O_RDONLY);
+ if (fd < 0) {
+ fprintf(stderr, "open '/dev/apm': %s\n", strerror(errno));
+ return NULL;
+ }
+
+ if (ioctl(fd, APM_IOC_GETPOWER, &apm_info) < 0) {
+ fprintf(stderr, "ioctl 'APM_IOC_GETPOWER': %s\n", strerror(errno));
+ close(fd);
+ return NULL;
+ }
+ close(fd);
+
+ return bprintf("%d", apm_info.battery_life);
+}
+#endif
+
+#if defined(__linux__)
+const char *
+battery_power(const char *bat)
+{
+ int watts;
+ char path[PATH_MAX];
+
+ snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/", bat, "/power_now");
+ return (pscanf(path, "%i", &watts) == 1) ?
+ bprintf("%d", (watts + 500000) / 1000000) : NULL;
+}
+
+const char *
+battery_state(const char *bat)
+{
+ struct {
+ char *state;
+ char *symbol;
+ } map[] = {
+ { "Charging", "+" },
+ { "Discharging", "-" },
+ { "Full", "=" },
+ { "Unknown", "/" },
+ };
+ size_t i;
+ char path[PATH_MAX], state[12];
+
+ snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/", bat, "/status");
+ if (pscanf(path, "%12s", state) != 1) {
+ return NULL;
+ }
+
+ for (i = 0; i < LEN(map); i++) {
+ if (!strcmp(map[i].state, state)) {
+ break;
+ }
+ }
+ return (i == LEN(map)) ? "?" : map[i].symbol;
+}
+#endif
diff --git a/components/cpu.c b/components/cpu.c
new file mode 100644
index 0000000..11e2e98
--- /dev/null
+++ b/components/cpu.c
@@ -0,0 +1,88 @@
+/* See LICENSE file for copyright and license details. */
+#include <errno.h>
+#include <stdio.h>
+#include <string.h>
+#if defined(__OpenBSD__)
+#include <sys/sysctl.h>
+#endif
+
+#include "../util.h"
+
+#if defined(__linux__)
+const char *
+cpu_freq(void)
+{
+ int freq;
+
+ return (pscanf("/sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq",
+ "%i", &freq) == 1) ?
+ bprintf("%d", (freq + 500) / 1000) : NULL;
+}
+
+const char *
+cpu_perc(void)
+{
+ int perc;
+ static long double a[7];
+ static int valid;
+ long double b[7];
+
+ memcpy(b, a, sizeof(b));
+ if (pscanf("/proc/stat", "%*s %Lf %Lf %Lf %Lf %Lf %Lf %Lf", &a[0], &a[1], &a[2],
+ &a[3], &a[4], &a[5], &a[6]) != 7) {
+ return NULL;
+ }
+ if (!valid) {
+ valid = 1;
+ return NULL;
+ }
+
+ perc = 100 * ((b[0]+b[1]+b[2]+b[5]+b[6]) - (a[0]+a[1]+a[2]+a[5]+a[6])) /
+ ((b[0]+b[1]+b[2]+b[3]+b[4]+b[5]+b[6]) - (a[0]+a[1]+a[2]+a[3]+a[4]+a[5]+a[6]));
+
+ return bprintf("%d", perc);
+}
+
+const char *
+cpu_iowait(void)
+{
+ int perc;
+ static int valid;
+ static long double a[7];
+ long double b[7];
+
+ memcpy(b, a, sizeof(b));
+ if (pscanf("/proc/stat", "%*s %Lf %Lf %Lf %Lf %Lf %Lf %Lf", &a[0], &a[1], &a[2],
+ &a[3], &a[4], &a[5], &a[6]) != 7) {
+ return NULL;
+ }
+ if (!valid) {
+ valid = 1;
+ return NULL;
+ }
+
+ perc = 100 * ((b[4]) - (a[4])) /
+ ((b[0]+b[1]+b[2]+b[3]+b[4]+b[5]+b[6]) - (a[0]+a[1]+a[2]+a[3]+a[4]+a[5]+a[6]));
+
+ return bprintf("%d", perc);
+}
+#elif defined(__OpenBSD__)
+const char *
+cpu_freq(void)
+{
+ int freq, mib[2];
+ size_t size;
+
+ mib[0] = CTL_HW;
+ mib[1] = HW_CPUSPEED;
+
+ size = sizeof(freq);
+
+ if (sysctl(mib, 2, &freq, &size, NULL, 0) == -1) {
+ fprintf(stderr, "sysctl 'HW_CPUSPEED': %s\n", strerror(errno));
+ return NULL;
+ }
+
+ return bprintf("%d", freq);
+}
+#endif
diff --git a/components/entropy.c b/components/entropy.c
new file mode 100644
index 0000000..65c65a1
--- /dev/null
+++ b/components/entropy.c
@@ -0,0 +1,15 @@
+/* See LICENSE file for copyright and license details. */
+#if defined(__linux__)
+#include <stdio.h>
+
+#include "../util.h"
+
+const char *
+entropy(void)
+{
+ int num;
+
+ return (pscanf("/proc/sys/kernel/random/entropy_avail", "%d", &num) == 1) ?
+ bprintf("%d", num) : NULL;
+}
+#endif
diff --git a/components/ram.c b/components/ram.c
new file mode 100644
index 0000000..55ec5b9
--- /dev/null
+++ b/components/ram.c
@@ -0,0 +1,129 @@
+/* See LICENSE file for copyright and license details. */
+#include <stdio.h>
+#if defined (__OpenBSD__)
+#include <sys/types.h>
+#include <sys/sysctl.h>
+#include <stdlib.h>
+#include <unistd.h>
+#endif
+
+#include "../util.h"
+
+#if defined(__linux__)
+const char *
+ram_free(void)
+{
+ long free;
+
+ return (pscanf("/proc/meminfo", "MemFree: %ld kB\n", &free) == 1) ?
+ bprintf("%f", (float)free / 1024 / 1024) : NULL;
+}
+
+const char *
+ram_perc(void)
+{
+ long total, free, buffers, cached;
+
+ return (pscanf("/proc/meminfo",
+ "MemTotal: %ld kB\n"
+ "MemFree: %ld kB\n"
+ "MemAvailable: %ld kB\nBuffers: %ld kB\n"
+ "Cached: %ld kB\n",
+ &total, &free, &buffers, &buffers, &cached) == 5) ?
+ bprintf("%d", 100 * ((total - free) - (buffers + cached)) / total) :
+ NULL;
+}
+
+const char *
+ram_total(void)
+{
+ long total;
+
+ return (pscanf("/proc/meminfo", "MemTotal: %ld kB\n", &total) == 1) ?
+ bprintf("%f", (float)total / 1024 / 1024) : NULL;
+}
+
+const char *
+ram_used(void)
+{
+ long total, free, buffers, cached;
+
+ return (pscanf("/proc/meminfo",
+ "MemTotal: %ld kB\n"
+ "MemFree: %ld kB\n"
+ "MemAvailable: %ld kB\nBuffers: %ld kB\n"
+ "Cached: %ld kB\n",
+ &total, &free, &buffers, &buffers, &cached) == 5) ?
+ bprintf("%f", (float)(total - free - buffers - cached) / 1024 / 1024) :
+ NULL;
+}
+#elif defined(__OpenBSD__)
+inline int
+load_uvmexp(struct uvmexp *uvmexp)
+{
+ int uvmexp_mib[] = {CTL_VM, VM_UVMEXP};
+ size_t size;
+
+ size = sizeof(*uvmexp);
+
+ return sysctl(uvmexp_mib, 2, uvmexp, &size, NULL, 0) >= 0 ? 1 : 0;
+}
+
+const char *
+ram_free(void)
+{
+ struct uvmexp uvmexp;
+ float free;
+ int free_pages;
+
+ if (load_uvmexp(&uvmexp)) {
+ free_pages = uvmexp.npages - uvmexp.active;
+ free = (double) (free_pages * uvmexp.pagesize) / 1024 / 1024 / 1024;
+ return bprintf("%f", free);
+ }
+
+ return NULL;
+}
+
+const char *
+ram_perc(void)
+{
+ struct uvmexp uvmexp;
+ int percent;
+
+ if (load_uvmexp(&uvmexp)) {
+ percent = uvmexp.active * 100 / uvmexp.npages;
+ return bprintf("%d", percent);
+ }
+
+ return NULL;
+}
+
+const char *
+ram_total(void)
+{
+ struct uvmexp uvmexp;
+ float total;
+
+ if (load_uvmexp(&uvmexp)) {
+ total = (double) (uvmexp.npages * uvmexp.pagesize) / 1024 / 1024 / 1024;
+ return bprintf("%f", total);
+ }
+
+ return NULL;
+}
+
+const char *
+ram_used(void)
+{
+ struct uvmexp uvmexp;
+ float used;
+
+ if (load_uvmexp(&uvmexp)) {
+ used = (double) (uvmexp.active * uvmexp.pagesize) / 1024 / 1024 / 1024;
+ return bprintf("%f", used);
+ }
+
+ return NULL;
+}
+#endif
diff --git a/components/swap.c b/components/swap.c
new file mode 100644
index 0000000..f3bbeb2
--- /dev/null
+++ b/components/swap.c
@@ -0,0 +1,138 @@
+/* See LICENSE file for copyright and license details. */
+#if defined(__linux__)
+#include <errno.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "../util.h"
+
+const char *
+swap_free(void)
+{
+ long total, free;
+ FILE *fp;
+ size_t bytes_read;
+ 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);
+ return NULL;
+ }
+ fclose(fp);
+
+ 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);
+}
+
+const char *
+swap_perc(void)
+{
+ long total, free, cached;
+ FILE *fp;
+ size_t bytes_read;
+ 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);
+ return NULL;
+ }
+ fclose(fp);
+
+ 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);
+}
+
+const char *
+swap_total(void)
+{
+ long total;
+ FILE *fp;
+ size_t bytes_read;
+ 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);
+ return NULL;
+ }
+ fclose(fp);
+
+ if ((match = strstr(buf, "SwapTotal")) == NULL)
+ return NULL;
+ sscanf(match, "SwapTotal: %ld kB\n", &total);
+
+ return bprintf("%f", (float)total / 1024 / 1024);
+}
+
+const char *
+swap_used(void)
+{
+ long total, free, cached;
+ FILE *fp;
+ size_t bytes_read;
+ 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);
+ return NULL;
+ }
+ fclose(fp);
+
+ 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);
+}
+#endif
diff --git a/components/temperature.c b/components/temperature.c
new file mode 100644
index 0000000..e2c6a77
--- /dev/null
+++ b/components/temperature.c
@@ -0,0 +1,45 @@
+/* See LICENSE file for copyright and license details. */
+#include <errno.h>
+#include <stdio.h>
+#include <string.h>
+#if defined(__OpenBSD__)
+#include <sys/sysctl.h>
+#include <sys/time.h>
+#include <sys/sensors.h>
+#endif
+
+#include "../util.h"
+
+#if defined(__linux__)
+const char *
+temp(const char *file)
+{
+ int temp;
+
+ return (pscanf(file, "%d", &temp) == 1) ?
+ bprintf("%d", temp / 1000) : NULL;
+}
+#elif defined(__OpenBSD__)
+const char *
+temp(const char *null)
+{
+ int mib[5];
+ size_t size;
+ struct sensor temp;
+
+ mib[0] = CTL_HW;
+ mib[1] = HW_SENSORS;
+ mib[2] = 0; /* cpu0 */
+ mib[3] = SENSOR_TEMP;
+ mib[4] = 0; /* temp0 */
+
+ size = sizeof(temp);
+
+ if (sysctl(mib, 5, &temp, &size, NULL, 0) == -1) {
+ fprintf(stderr, "sysctl 'SENSOR_TEMP': %s\n", strerror(errno));
+ return NULL;
+ }
+
+ return bprintf("%d", (temp.value - 273150000) / 1000000); /* kelvin to celsius */
+}
+#endif
diff --git a/components/uptime.c b/components/uptime.c
new file mode 100644
index 0000000..debe4cb
--- /dev/null
+++ b/components/uptime.c
@@ -0,0 +1,63 @@
+/* See LICENSE file for copyright and license details. */
+#include <errno.h>
+#include <stdio.h>
+#include <string.h>
+#if defined(__linux__)
+#include <sys/sysinfo.h>
+#elif defined(__OpenBSD__)
+#include <sys/sysctl.h>
+#include <sys/time.h>
+#endif
+
+#include "../util.h"
+
+#if defined(__linux__)
+const char *
+uptime(void)
+{
+ int h;
+ int m;
+ int uptime = 0;
+ struct sysinfo info;
+
+ sysinfo(&info);
+ uptime = info.uptime;
+
+ h = uptime / 3600;
+ m = (uptime - h * 3600) / 60;
+
+ return bprintf("%dh %dm", h, m);
+}
+#elif defined(__OpenBSD__)
+const char *
+uptime(void)
+{
+ int h;
+ int m;
+ int uptime = 0;
+
+ int mib[2];
+ size_t size;
+ time_t now;
+ struct timeval boottime;
+
+ time(&now);
+
+ mib[0] = CTL_KERN;
+ mib[1] = KERN_BOOTTIME;
+
+ size = sizeof(boottime);
+
+ if (sysctl(mib, 2, &boottime, &size, NULL, 0) != -1)
+ uptime = now - boottime.tv_sec;
+ else {
+ fprintf(stderr, "sysctl 'KERN_BOOTTIME': %s\n", strerror(errno));
+ return NULL;
+ }
+
+ h = uptime / 3600;
+ m = (uptime - h * 3600) / 60;
+
+ return bprintf("%dh %dm", h, m);
+}
+#endif
diff --git a/components/wifi.c b/components/wifi.c
new file mode 100644
index 0000000..388a30d
--- /dev/null
+++ b/components/wifi.c
@@ -0,0 +1,92 @@
+/* See LICENSE file for copyright and license details. */
+#if defined(__linux__)
+#include <errno.h>
+#include <ifaddrs.h>
+#include <linux/wireless.h>
+#include <sys/socket.h>
+#include <stdio.h>
+#include <limits.h>
+#include <string.h>
+#include <sys/ioctl.h>
+#include <unistd.h>
+
+#include "../util.h"
+
+const char *
+wifi_perc(const char *iface)
+{
+ int i, cur;
+ float perc;
+ int total = 70; /* the max of /proc/net/wireless */
+ char *p, *datastart;
+ char path[PATH_MAX];
+ char status[5];
+ FILE *fp;
+
+ snprintf(path, sizeof(path), "%s%s%s", "/sys/class/net/", iface, "/operstate");
+ fp = fopen(path, "r");
+ if (fp == NULL) {
+ fprintf(stderr, "fopen '%s': %s\n", path, strerror(errno));
+ return NULL;
+ }
+ p = fgets(status, 5, fp);
+ fclose(fp);
+ if(!p || strcmp(status, "up\n") != 0) {
+ return NULL;
+ }
+
+ fp = fopen("/proc/net/wireless", "r");
+ if (fp == NULL) {
+ fprintf(stderr, "fopen '/proc/net/wireless': %s\n", strerror(errno));
+ return NULL;
+ }
+
+ for (i = 0; i < 3; i++) {
+ if (!(p = fgets(buf, sizeof(buf) - 1, fp)))
+ break;
+ }
+ fclose(fp);
+ if (i < 2 || !p)
+ return NULL;
+
+ if ((datastart = strstr(buf, iface)) == NULL)
+ return NULL;
+
+ datastart = (datastart+(strlen(iface)+1));
+ sscanf(datastart + 1, " %*d %d %*d %*d %*d %*d %*d %*d %*d %*d", &cur);
+
+ perc = (float)cur / total * 100.0;
+
+ return bprintf("%.0f", perc);
+}
+
+const char *
+wifi_essid(const char *iface)
+{
+ static char id[IW_ESSID_MAX_SIZE+1];
+ int sockfd = socket(AF_INET, SOCK_DGRAM, 0);
+ struct iwreq wreq;
+
+ memset(&wreq, 0, sizeof(struct iwreq));
+ wreq.u.essid.length = IW_ESSID_MAX_SIZE+1;
+ snprintf(wreq.ifr_name, sizeof(wreq.ifr_name), "%s", iface);
+
+ if (sockfd == -1) {
+ fprintf(stderr, "socket 'AF_INET': %s\n", strerror(errno));
+ return NULL;
+ }
+ wreq.u.essid.pointer = id;
+ if (ioctl(sockfd,SIOCGIWESSID, &wreq) == -1) {
+ fprintf(stderr, "ioctl 'SIOCGIWESSID': %s\n", strerror(errno));
+ close(sockfd);
+ return NULL;
+ }
+
+ close(sockfd);
+
+ if (strcmp(id, "") == 0)
+ return NULL;
+ else
+ return id;
+}
+#endif
--
cgit v1.2.3