X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/e79d4932ea413c277425ff92c456741e0730c3d6..10bdf01b715dcc994f3fe32a6881d5e0b2613a6c:/components/cpu.c?ds=sidebyside

diff --git a/components/cpu.c b/components/cpu.c
index a001d14..9e28003 100644
--- a/components/cpu.c
+++ b/components/cpu.c
@@ -1,65 +1,164 @@
 /* See LICENSE file for copyright and license details. */
-#if defined(__linux__)
+#include <stdint.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 defined(__linux__)
+	const char *
+	cpu_freq(void)
+	{
+		uintmax_t freq;
+
+		/* in kHz */
+		if (pscanf("/sys/devices/system/cpu/cpu0/cpufreq/"
+		           "scaling_cur_freq", "%ju", &freq) != 1) {
+			return NULL;
+		}
+
+		return fmt_human(freq * 1000, 1000);
 	}
-	if (!valid) {
-		valid = 1;
-		return NULL;
+
+	const char *
+	cpu_perc(void)
+	{
+		static long double a[7];
+		long double b[7], sum;
+
+		memcpy(b, a, sizeof(b));
+		/* cpu user nice system idle iowait irq softirq */
+		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 (b[0] == 0) {
+			return NULL;
+		}
+
+		sum = (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]);
+
+		if (sum == 0) {
+			return NULL;
+		}
+
+		return bprintf("%d", (int)(100 *
+		               ((b[0] + b[1] + b[2] + b[5] + b[6]) -
+		                (a[0] + a[1] + a[2] + a[5] + a[6])) / sum));
 	}
+#elif defined(__OpenBSD__)
+	#include <sys/param.h>
+	#include <sys/sched.h>
+	#include <sys/sysctl.h>
+
+	const char *
+	cpu_freq(void)
+	{
+		int freq, mib[2];
+		size_t size;
 
-	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]));
+		mib[0] = CTL_HW;
+		mib[1] = HW_CPUSPEED;
 
-	return bprintf("%d", perc);
-}
+		size = sizeof(freq);
 
-const char *
-cpu_iowait(void)
-{
-	int perc;
-	static int valid;
-	static long double a[7];
-	long double b[7];
+		/* in MHz */
+		if (sysctl(mib, 2, &freq, &size, NULL, 0) < 0) {
+			warn("sysctl 'HW_CPUSPEED':");
+			return NULL;
+		}
 
-	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;
+		return fmt_human(freq * 1E6, 1000);
 	}
-	if (!valid) {
-		valid = 1;
-		return NULL;
+
+	const char *
+	cpu_perc(void)
+	{
+		int mib[2];
+		static uintmax_t a[CPUSTATES];
+		uintmax_t b[CPUSTATES], sum;
+		size_t size;
+
+		mib[0] = CTL_KERN;
+		mib[1] = KERN_CPTIME;
+
+		size = sizeof(a);
+
+		memcpy(b, a, sizeof(b));
+		if (sysctl(mib, 2, &a, &size, NULL, 0) < 0) {
+			warn("sysctl 'KERN_CPTIME':");
+			return NULL;
+		}
+		if (b[0] == 0) {
+			return NULL;
+		}
+
+		sum = (a[CP_USER] + a[CP_NICE] + a[CP_SYS] + a[CP_INTR] + a[CP_IDLE]) -
+		      (b[CP_USER] + b[CP_NICE] + b[CP_SYS] + b[CP_INTR] + b[CP_IDLE]);
+
+		if (sum == 0) {
+			return NULL;
+		}
+
+		return bprintf("%d", 100 *
+		               ((a[CP_USER] + a[CP_NICE] + a[CP_SYS] +
+		                 a[CP_INTR]) -
+		                (b[CP_USER] + b[CP_NICE] + b[CP_SYS] +
+		                 b[CP_INTR])) / sum);
+	}
+#elif defined(__FreeBSD__)
+	#include <sys/param.h>
+	#include <sys/sysctl.h>
+	#include <devstat.h>
+
+	const char *
+	cpu_freq(void)
+	{
+		int freq;
+		size_t size;
+
+		size = sizeof(freq);
+		/* in MHz */
+		if (sysctlbyname("hw.clockrate", &freq, &size, NULL, 0) == -1
+				|| !size) {
+			warn("sysctlbyname 'hw.clockrate':");
+			return NULL;
+		}
+
+		return fmt_human(freq * 1E6, 1000);
 	}
 
-	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_perc(void)
+	{
+		size_t size;
+		static long a[CPUSTATES];
+		long b[CPUSTATES], sum;
+
+		size = sizeof(a);
+		memcpy(b, a, sizeof(b));
+		if (sysctlbyname("kern.cp_time", &a, &size, NULL, 0) == -1
+				|| !size) {
+			warn("sysctlbyname 'kern.cp_time':");
+			return NULL;
+		}
+		if (b[0] == 0) {
+			return NULL;
+		}
 
-	return bprintf("%d", perc);
-}
+		sum = (a[CP_USER] + a[CP_NICE] + a[CP_SYS] + a[CP_INTR] + a[CP_IDLE]) -
+		      (b[CP_USER] + b[CP_NICE] + b[CP_SYS] + b[CP_INTR] + b[CP_IDLE]);
+
+		if (sum == 0) {
+			return NULL;
+		}
+
+		return bprintf("%d", 100 *
+		               ((a[CP_USER] + a[CP_NICE] + a[CP_SYS] +
+		                 a[CP_INTR]) -
+		                (b[CP_USER] + b[CP_NICE] + b[CP_SYS] +
+		                 b[CP_INTR])) / sum);
+	}
 #endif