From 20cbd607759038dca57f84ef7e7b5d44a3088574 Mon Sep 17 00:00:00 2001 From: Alexander Monakov Date: Tue, 24 Feb 2015 21:44:07 +0300 Subject: getloadavg: use sysinfo() instead of /proc/loadavg Based on a patch by Szabolcs Nagy. --- src/legacy/getloadavg.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/legacy/getloadavg.c b/src/legacy/getloadavg.c index 43a8c9e3..ff06de0f 100644 --- a/src/legacy/getloadavg.c +++ b/src/legacy/getloadavg.c @@ -1,18 +1,14 @@ #define _GNU_SOURCE #include -#include -#include +#include int getloadavg(double *a, int n) { - int i; - double b[3]; - FILE *f = fopen("/proc/loadavg", "rbe"); - if (!f) return -1; - i = fscanf(f, "%lf %lf %lf", b, b+1, b+2); - fclose(f); - if (n > i) n = i; - if (n < 0) return -1; - memcpy(a, b, n * sizeof *a); + struct sysinfo si; + if (n <= 0) return n ? -1 : 0; + sysinfo(&si); + if (n > 3) n = 3; + for (int i=0; i