public inbox for glibc-cvs@sourceware.org help / color / mirror / Atom feed
From: Adhemerval Zanella <azanella@sourceware.org> To: glibc-cvs@sourceware.org Subject: [glibc] Linux: implement getloadavg(3) using sysinfo(2) Date: Fri, 8 Oct 2021 12:53:25 +0000 (GMT) [thread overview] Message-ID: <20211008125325.963D33858431@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=b5c8a3aa82f66f49b731ca5204104cee48bccfa5 commit b5c8a3aa82f66f49b731ca5204104cee48bccfa5 Author: Cristian Rodríguez <crrodriguez@opensuse.org> Date: Fri Aug 6 15:17:48 2021 -0400 Linux: implement getloadavg(3) using sysinfo(2) Signed-off-by: Cristian Rodríguez <crrodriguez@opensuse.org> Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org> Diff: --- sysdeps/unix/sysv/linux/getloadavg.c | 50 ++++++++++-------------------------- 1 file changed, 14 insertions(+), 36 deletions(-) diff --git a/sysdeps/unix/sysv/linux/getloadavg.c b/sysdeps/unix/sysv/linux/getloadavg.c index e50cc396e7..6f3e5b93a8 100644 --- a/sysdeps/unix/sysv/linux/getloadavg.c +++ b/sysdeps/unix/sysv/linux/getloadavg.c @@ -1,4 +1,4 @@ -/* Get system load averages. Linux (/proc/loadavg) version. +/* Get system load averages. Linux version. Copyright (C) 1999-2021 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -16,53 +16,31 @@ License along with the GNU C Library; if not, see <https://www.gnu.org/licenses/>. */ -#include <errno.h> -#include <fcntl.h> -#include <locale.h> -#include <stdlib.h> -#include <unistd.h> -#include <not-cancel.h> +#include <array_length.h> +#include <sys/param.h> +#include <sys/sysinfo.h> /* Put the 1 minute, 5 minute and 15 minute load averages into the first NELEM elements of LOADAVG. Return the number written (never more than 3, but may be less than NELEM), or -1 if an error occurred. */ +#define CLAMP(v, lo, hi) MIN (MAX (v, lo), hi) + +#define SYSINFO_LOADS_SCALE (1 << SI_LOAD_SHIFT) + int getloadavg (double loadavg[], int nelem) { - int fd; + struct sysinfo info; - fd = __open_nocancel ("/proc/loadavg", O_RDONLY); - if (fd < 0) + if (__sysinfo (&info) != 0) return -1; - else - { - char buf[65], *p; - ssize_t nread; - int i; - nread = __read_nocancel (fd, buf, sizeof buf - 1); - __close_nocancel_nostatus (fd); - if (nread <= 0) - return -1; - buf[nread - 1] = '\0'; + nelem = CLAMP (nelem, 0, array_length (info.loads)); - if (nelem > 3) - nelem = 3; - p = buf; - for (i = 0; i < nelem; ++i) - { - char *endp; - loadavg[i] = __strtod_l (p, &endp, _nl_C_locobj_ptr); - if (endp == p) - /* This should not happen. The format of /proc/loadavg - must have changed. Don't return with what we have, - signal an error. */ - return -1; - p = endp; - } + for (int i = 0; i < nelem; i++) + loadavg[i] = (double) info.loads[i] / SYSINFO_LOADS_SCALE; - return i; - } + return nelem; }
reply other threads:[~2021-10-08 12:53 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20211008125325.963D33858431@sourceware.org \ --to=azanella@sourceware.org \ --cc=glibc-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).