X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/66a7fb16fc903ac7ef6ce1acdbb353f1072cd0ec..16e15217c6cb56bd4125c54e645b932a50655b9d:/components/cpu.c?ds=sidebyside

diff --git a/components/cpu.c b/components/cpu.c
index c8299f9..cd5ebe4 100644
--- a/components/cpu.c
+++ b/components/cpu.c
@@ -1,27 +1,31 @@
 /* See LICENSE file for copyright and license details. */
-#include <errno.h>
 #include <stdio.h>
 #include <string.h>
 
 #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(freq * 1000, 1000);
 	}
 
 	const char *
 	cpu_perc(void)
 	{
-		int perc;
 		static long double a[7];
-		static int valid;
 		long double b[7];
 
 		memcpy(b, a, sizeof(b));
@@ -30,17 +34,15 @@
 		           &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;
 		}
 
-		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);
+		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>
@@ -58,20 +60,19 @@
 
 		size = sizeof(freq);
 
-		if (sysctl(mib, 2, &freq, &size, NULL, 0) == -1) {
-			fprintf(stderr, "sysctl 'HW_CPUSPEED': %s\n",
-			        strerror(errno));
+		/* in MHz */
+		if (sysctl(mib, 2, &freq, &size, NULL, 0) < 0) {
+			warn("sysctl 'HW_CPUSPEED':");
 			return NULL;
 		}
 
-		return bprintf("%d", freq);
+		return fmt_human((size_t)freq * 1000 * 1000, 1000);
 	}
 
 	const char *
 	cpu_perc(void)
 	{
-		int mib[2], perc;
-		static int valid;
+		int mib[2];
 		static long int a[CPUSTATES];
 		long int b[CPUSTATES];
 		size_t size;
@@ -82,21 +83,20 @@
 		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));
+		if (sysctl(mib, 2, &a, &size, NULL, 0) < 0) {
+			warn("sysctl 'KERN_CPTIME':");
 			return NULL;
 		}
-		if (!valid) {
-			valid = 1;
+		if (b[0] == 0) {
 			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);
+		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