From 3111334ddd5b29ef723a06688bd81a5f8eae8322 Mon Sep 17 00:00:00 2001 From: Craig Small Date: Tue, 31 May 2022 21:35:40 +1000 Subject: [PATCH] tload: Report on lack of /proc/loadavg Now that the library correctly returns an error if loadavg is not available, tload can tell the user the bad news. References: procps-ng/procps#227 commit 8fcd14de18b998647ba47f5b35feb1d85e2d2f08 Signed-off-by: Craig Small --- tload.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/tload.c b/tload.c index 279b4b53..993c13bc 100644 --- a/tload.c +++ b/tload.c @@ -170,11 +170,20 @@ int main(int argc, char **argv) alrm(0); while (1) { + int rc; if (scale_fact < max_scale) scale_fact *= 2.0; /* help it drift back up. */ - procps_loadavg(&av[0], &av[1], &av[2]); + if ((rc = procps_loadavg(&av[0], &av[1], &av[2])) < 0) + { + if (rc == -ENOENT) + xerrx(EXIT_FAILURE, + _("Load average file /proc/loadavg does not exist")); + else + xerrx(EXIT_FAILURE, + _("Unable to get load average")); + } do { lines = av[0] * scale_fact;