X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/0bc6855741cc9fbdf5c3ffd0d9cb983b0a66f635..c2492c3f99d9d434a6f935dea8e97fa27cdd2adc:/components/cpu.c?ds=inline

diff --git a/components/cpu.c b/components/cpu.c
index 2e910d9..14c8658 100644
--- a/components/cpu.c
+++ b/components/cpu.c
@@ -1,5 +1,4 @@
 /* See LICENSE file for copyright and license details. */
-#include <errno.h>
 #include <stdio.h>
 #include <string.h>
 
@@ -12,21 +11,20 @@
 	const char *
 	cpu_freq(void)
 	{
-		uint64_t freq;
+		uintmax_t freq;
 
 		/* in kHz */
 		if (pscanf("/sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq",
-		            "%"SCNu64, &freq) != 1) {
+		            "%" PRIuMAX, &freq) != 1) {
 			return NULL;
 		}
 
-		return fmt_human_10(freq * 1000, "Hz");
+		return fmt_human(freq * 1000, 1000);
 	}
 
 	const char *
 	cpu_perc(void)
 	{
-		static int valid;
 		static long double a[7];
 		long double b[7];
 
@@ -36,18 +34,18 @@
 		           &a[0], &a[1], &a[2], &a[3], &a[4], &a[5], &a[6]) != 7) {
 			return NULL;
 		}
-		if (!valid) {
-			valid = 1;
+		if (b[0] == 0) {
 			return NULL;
 		}
 
-		return bprintf("%d%%", (int)(100 *
+		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])) /
 		               ((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]))));
 	}
 #elif defined(__OpenBSD__)
+	#include <inttypes.h>
 	#include <sys/param.h>
 	#include <sys/sched.h>
 	#include <sys/sysctl.h>
@@ -55,7 +53,8 @@
 	const char *
 	cpu_freq(void)
 	{
-		int freq, mib[2];
+		int mib[2];
+		uintmax_t freq;
 		size_t size;
 
 		mib[0] = CTL_HW;
@@ -69,16 +68,15 @@
 			return NULL;
 		}
 
-		return fmt_human_10((size_t)freq * 1000 * 1000, "Hz");
+		return fmt_human(freq * 1E6, 1000);
 	}
 
 	const char *
 	cpu_perc(void)
 	{
 		int mib[2];
-		static int valid;
-		static long int a[CPUSTATES];
-		long int b[CPUSTATES];
+		static uintmax_t a[CPUSTATES];
+		uintmax_t b[CPUSTATES];
 		size_t size;
 
 		mib[0] = CTL_KERN;
@@ -91,12 +89,11 @@
 			warn("sysctl 'KERN_CPTIME':");
 			return NULL;
 		}
-		if (!valid) {
-			valid = 1;
+		if (b[0] == 0) {
 			return NULL;
 		}
 
-		return bprintf("%d%%", 100 *
+		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])) /
 		               ((a[CP_USER] + a[CP_NICE] + a[CP_SYS] + a[CP_INTR] +