lhark/slstatus
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

cpu: Simplify functions

Browse source
This commit is contained in:
Aaron Marcher 2018-05-07 11:39:59 +02:00
parent 16a97fbca1
commit b3330d849d
1 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
components/cpu.c
View file

@ -19,9 +19,8 @@
const char * const char *
cpu_perc(void) cpu_perc(void)
{ {
int perc;
static long double a[7];
static int valid; static int valid;
static long double a[7];
long double b[7]; long double b[7];
memcpy(b, a, sizeof(b)); memcpy(b, a, sizeof(b));
@ -35,12 +34,11 @@
return NULL; return NULL;
} }
perc = 100 * ((b[0] + b[1] + b[2] + b[5] + b[6]) - return bprintf("%d", 100 *
(a[0] + a[1] + a[2] + a[5] + a[6])) / ((b[0] + b[1] + b[2] + b[5] + b[6]) -
((b[0] + b[1] + b[2] + b[3] + b[4] + b[5] + b[6]) - (a[0] + a[1] + a[2] + a[5] + a[6])) /
(a[0] + a[1] + a[2] + a[3] + a[4] + 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);
} }
#elif defined(__OpenBSD__) #elif defined(__OpenBSD__)
#include <sys/param.h> #include <sys/param.h>
@ -69,7 +67,7 @@
const char * const char *
cpu_perc(void) cpu_perc(void)
{ {
int mib[2], perc; int mib[2];
static int valid; static int valid;
static long int a[CPUSTATES]; static long int a[CPUSTATES];
long int b[CPUSTATES]; long int b[CPUSTATES];
@ -90,12 +88,12 @@
return NULL; return NULL;
} }
perc = 100 * return bprintf("%d", 100 *
((a[CP_USER] + a[CP_NICE] + a[CP_SYS] + a[CP_INTR]) - ((a[CP_USER] + a[CP_NICE] + a[CP_SYS] + a[CP_INTR]) -
(b[CP_USER] + b[CP_NICE] + b[CP_SYS] + b[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]) - ((a[CP_USER] + a[CP_NICE] + a[CP_SYS] + a[CP_INTR] +
(b[CP_USER] + b[CP_NICE] + b[CP_SYS] + b[CP_INTR] + b[CP_IDLE])); a[CP_IDLE]) -
(b[CP_USER] + b[CP_NICE] + b[CP_SYS] + b[CP_INTR] +
return bprintf("%d", perc); b[CP_IDLE])));
} }
#endif #endif