X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/9750a3d731cd381e832bcacf1d03e48ddb46cc16..235fa3c3065a93d24efb06d0dc8a9fffae5d32cd:/components/cpu.c

diff --git a/components/cpu.c b/components/cpu.c
index e7f4cd9..661c27c 100644
--- a/components/cpu.c
+++ b/components/cpu.c
@@ -25,6 +25,7 @@
 		long double b[7];
 
 		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;
@@ -34,11 +35,10 @@
 			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]));
+		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);
 	}
@@ -68,6 +68,8 @@
 		return bprintf("%d", perc);
 	}
 #elif defined(__OpenBSD__)
+	#include <sys/param.h>
+	#include <sys/sched.h>
 	#include <sys/sysctl.h>
 
 	const char *
@@ -89,4 +91,37 @@
 
 		return bprintf("%d", freq);
 	}
+
+	const char *
+	cpu_perc(void)
+	{
+		int mib[2], perc;
+		static int valid;
+		static long int a[CPUSTATES];
+		long int b[CPUSTATES];
+		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) == -1) {
+			fprintf(stderr, "sysctl 'KERN_CPTIME': %s\n", strerror(errno));
+			return NULL;
+		}
+		if (!valid) {
+			valid = 1;
+			return NULL;
+		}
+
+		perc = 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])) /
+		      ((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]));
+
+		return bprintf("%d", perc);
+	}
 #endif