summaryrefslogtreecommitdiff
path: root/components/cpu.c
diff options
context:
space:
mode:
authorLaslo Hunhold <dev@frign.de>2018-05-01 19:01:22 +0200
committerAaron Marcher <me@drkhsh.at>2018-05-01 19:43:49 +0200
commit9750a3d731cd381e832bcacf1d03e48ddb46cc16 (patch)
treed3b6d97ad8434a14e8fed7dfe3a2e733df4e05bb /components/cpu.c
parent42edfea89a47cbf0623d1aaf5673a4e5ca79fb52 (diff)
Use indentation to increase readability
Granted, this style is definitely not common, but for the short utility-functions of this program it's just the right choice. This provides great flexibility, such that in the long run, it will be possible to also share code between the OS-implementations. This also keeps the state-keeping at a minimum and makes it clearer which functions are implemented on which OS without having to jiggle around with too many files in the process.
Diffstat (limited to 'components/cpu.c')
-rw-r--r--components/cpu.c136
1 files changed, 70 insertions, 66 deletions
diff --git a/components/cpu.c b/components/cpu.c
index 11e2e98..e7f4cd9 100644
--- a/components/cpu.c
+++ b/components/cpu.c
@@ -2,87 +2,91 @@
#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;
+ 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;
}
- 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]));
+ const char *
+ cpu_perc(void)
+ {
+ int perc;
+ static long double a[7];
+ static int valid;
+ long double b[7];
- return bprintf("%d", perc);
-}
+ 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;
+ }
-const char *
-cpu_iowait(void)
-{
- int perc;
- static int valid;
- static long double a[7];
- long double b[7];
+ 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]));
- 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;
+ return bprintf("%d", perc);
}
- 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]));
+ 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;
+ }
- return bprintf("%d", perc);
-}
+ 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;
+ #include <sys/sysctl.h>
- mib[0] = CTL_HW;
- mib[1] = HW_CPUSPEED;
+ const char *
+ cpu_freq(void)
+ {
+ int freq, mib[2];
+ size_t size;
- size = sizeof(freq);
+ mib[0] = CTL_HW;
+ mib[1] = HW_CPUSPEED;
- if (sysctl(mib, 2, &freq, &size, NULL, 0) == -1) {
- fprintf(stderr, "sysctl 'HW_CPUSPEED': %s\n", strerror(errno));
- return NULL;
- }
+ size = sizeof(freq);
- return bprintf("%d", 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