diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2017-01-30 15:32:05 +0100 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2017-02-06 23:43:46 +0100 |
commit | f1e670756f3c98a488b415e656692572a31baa91 (patch) | |
tree | a165417242f8789a7230b5e0667e4ea596f1ba61 | |
parent | 8cfc6cba3e462086e32f7d340da6ac0e1635babb (diff) |
rsmemsiz: Use standard libc function to get load average.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r-- | rose/rsmemsiz.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/rose/rsmemsiz.c b/rose/rsmemsiz.c index f4a707d..96caca1 100644 --- a/rose/rsmemsiz.c +++ b/rose/rsmemsiz.c @@ -64,21 +64,6 @@ static int uptime(double *uptime_secs, double *idle_secs) return up; /* assume never be zero seconds in practice */ } -static int loadavg(double *av1, double *av5, double *av15) -{ - double avg_1=0, avg_5=0, avg_15=0; - - FILE_TO_BUF(PROC_LOADAVG_FILE) - if (sscanf(buf, "%lf %lf %lf", &avg_1, &avg_5, &avg_15) < 3) { - fprintf(stdout, "ERROR: Bad data in %s\r", PROC_LOADAVG_FILE); - return 0; - } - SET_IF_DESIRED(av1, avg_1); - SET_IF_DESIRED(av5, avg_5); - SET_IF_DESIRED(av15, avg_15); - return 1; -} - /* The following /proc/meminfo parsing routine assumes the following format: [ <label> ... ] # header lines [ <label> ] <num> [ <num> ... ] # table rows @@ -171,7 +156,7 @@ int main(int argc, char **argv) fprintf(stdout, "%d hour%s ", uphours, (uphours != 1) ? "s" : ""); fprintf(stdout, "%d minute%s\r", upminutes, (upminutes != 1) ? "s" : ""); - loadavg(&av[0], &av[1], &av[2]); + getloadavg(av, 3); fprintf(stdout, "Load average: %.2f, %.2f, %.2f\r", av[0], av[1], av[2]); if (!(mem = meminfo()) || mem[meminfo_main][meminfo_total] == 0) { |