slstatus

commit 66a7fb16fc903ac7ef6ce1acdbb353f1072cd0ec
parent 235fa3c3065a93d24efb06d0dc8a9fffae5d32cd
Author: Aaron Marcher <me@drkhsh.at>
Date:   Sun,  6 May 2018 21:11:50 +0200

Remove cpu_iowait

The third value from load_avg (idle) gives us almost the same
information as cpu_iowait. Plus OpenBSD does not offer an iowait value
as Linux and thus the corresponding function would not be portable.

Diffstat:
M
README
 | 
2
--
M
components/cpu.c
 | 
25
-------------------------
M
config.def.h
 | 
1
-
M
slstatus.h
 | 
1
-

4 files changed, 0 insertions(+), 29 deletions(-)
diff --git a/README b/README
@@ -9,7 +9,6 @@ Features
 - Battery percentage/state
 - CPU usage
 - CPU frequency
-- CPU iowait
 - Custom shell commands
 - Date and time
 - Disk status (free storage, percentage, total storage and used storage)
@@ -62,5 +61,4 @@ Porting to OpenBSD is the current goal before thinking about a release.
 
 The following functions are not portable at the moment:
 - wifi_{perc,essid}
-- cpu_iowait
 - entropy
diff --git a/components/cpu.c b/components/cpu.c
@@ -42,31 +42,6 @@
 
 		return bprintf("%d", perc);
 	}
-
-	const char *
-	cpu_iowait(void)
-	{
-		int perc;
-		static int valid;
-		static long double a[7];
-		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 (!valid) {
-			valid = 1;
-			return NULL;
-		}
-
-		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]));
-
-		return bprintf("%d", perc);
-	}
 #elif defined(__OpenBSD__)
 	#include <sys/param.h>
 	#include <sys/sched.h>
diff --git a/config.def.h b/config.def.h
@@ -15,7 +15,6 @@ static const char unknown_str[] = "n/a";
  * battery_perc         battery percentage              battery name (BAT0)
  * battery_state        battery charging state          battery name (BAT0)
  * cpu_perc             cpu usage in percent            NULL
- * cpu_iowait           cpu iowait in percent           NULL
  * cpu_freq             cpu frequency in MHz            NULL
  * datetime             date and time                   format string (%F %T)
  * disk_free            free disk space in GB           mountpoint path (/)
diff --git a/slstatus.h b/slstatus.h
@@ -7,7 +7,6 @@ const char *battery_state(const char *);
 /* cpu */
 const char *cpu_freq(void);
 const char *cpu_perc(void);
-const char *cpu_iowait(void);
 
 /* datetime */
 const char *datetime(const char *);