X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/b3330d849def11137a6905675e123b7ba9cce438..0bc6855741cc9fbdf5c3ffd0d9cb983b0a66f635:/components/cpu.c

diff --git a/components/cpu.c b/components/cpu.c
index 6551f31..2e910d9 100644
--- a/components/cpu.c
+++ b/components/cpu.c
@@ -6,14 +6,21 @@
 #include "../util.h"
 
 #if defined(__linux__)
+	#include <inttypes.h>
+	#include <stdint.h>
+
 	const char *
 	cpu_freq(void)
 	{
-		int freq;
+		uint64_t freq;
+
+		/* in kHz */
+		if (pscanf("/sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq",
+		            "%"SCNu64, &freq) != 1) {
+			return NULL;
+		}
 
-		return (pscanf("/sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq",
-		               "%i", &freq) == 1) ?
-		       bprintf("%d", (freq + 500) / 1000) : NULL;
+		return fmt_human_10(freq * 1000, "Hz");
 	}
 
 	const char *
@@ -34,11 +41,11 @@
 			return NULL;
 		}
 
-		return bprintf("%d", 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%%", (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 <sys/param.h>
@@ -56,12 +63,13 @@
 
 		size = sizeof(freq);
 
+		/* in MHz */
 		if (sysctl(mib, 2, &freq, &size, NULL, 0) < 0) {
-			fprintf(stderr, "sysctl 'HW_CPUSPEED': %s\n", strerror(errno));
+			warn("sysctl 'HW_CPUSPEED':");
 			return NULL;
 		}
 
-		return bprintf("%d", freq);
+		return fmt_human_10((size_t)freq * 1000 * 1000, "Hz");
 	}
 
 	const char *
@@ -80,7 +88,7 @@
 
 		memcpy(b, a, sizeof(b));
 		if (sysctl(mib, 2, &a, &size, NULL, 0) < 0) {
-			fprintf(stderr, "sysctl 'KERN_CPTIME': %s\n", strerror(errno));
+			warn("sysctl 'KERN_CPTIME':");
 			return NULL;
 		}
 		if (!valid) {
@@ -88,12 +96,12 @@
 			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])) /
-					   ((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%%", 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])));
 	}
 #endif