slstatus

Unnamed repository; edit this file 'description' to name the repository.
git clone https://git.beauhilton.com/slstatus.git
Log | Files | Refs | README | LICENSE

commit f088dbfea06363a84533bb9f1a84f756c46bc3b2
parent 720569bd56cb048ba7abae62be3c2e6839fd5916
Author: Quentin Rameau <quinq@fifth.space>
Date:   Mon, 30 Apr 2018 15:14:33 +0200

cpu: OS split

Diffstat:
MMakefile | 2+-
Acomponents/Linux/cpu.c | 64++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Acomponents/OpenBSD/cpu.c | 26++++++++++++++++++++++++++
Dcomponents/cpu.c | 88-------------------------------------------------------------------------------
4 files changed, 91 insertions(+), 89 deletions(-)

diff --git a/Makefile b/Makefile @@ -8,7 +8,7 @@ include config.mk REQ = util COM =\ components/$(OS)/battery \ - components/cpu\ + components/$(OS)/cpu \ components/datetime\ components/disk\ components/entropy\ diff --git a/components/Linux/cpu.c b/components/Linux/cpu.c @@ -0,0 +1,64 @@ +/* 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/OpenBSD/cpu.c b/components/OpenBSD/cpu.c @@ -0,0 +1,26 @@ +/* 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/cpu.c b/components/cpu.c @@ -1,88 +0,0 @@ -/* 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