From: Alexander Monakov <amonakov@ispras.ru>
To: musl@lists.openwall.com
Cc: Alexander Monakov <amonakov@ispras.ru>
Subject: [PATCH] getloadavg: use sysinfo() instead of /proc/loadavg
Date: Tue, 24 Feb 2015 21:44:07 +0300 [thread overview]
Message-ID: <1424803447-5140-1-git-send-email-amonakov@ispras.ru> (raw)
Based on a patch by Szabolcs Nagy.
---
This is a followup to a recent IRC conversation. getloadavg() doesn't really
need to open a file in /proc, since a sysinfo() syscall should suffice. Based
on a patch by nsz, slightly adjusted. Return value of sysinfo() call is not
checked, since the only documented failure is with EFAULT.
src/legacy/getloadavg.c | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/src/legacy/getloadavg.c b/src/legacy/getloadavg.c
index 43a8c9e..ff06de0 100644
--- a/src/legacy/getloadavg.c
+++ b/src/legacy/getloadavg.c
@@ -1,18 +1,14 @@
#define _GNU_SOURCE
#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
+#include <sys/sysinfo.h>
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<n; i++)
+ a[i] = 1.0/(1<<SI_LOAD_SHIFT) * si.loads[i];
return n;
}
--
2.1.3
next reply other threads:[~2015-02-24 18:44 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-24 18:44 Alexander Monakov [this message]
2015-02-25 20:51 ` Rich Felker
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=1424803447-5140-1-git-send-email-amonakov@ispras.ru \
--to=amonakov@ispras.ru \
--cc=musl@lists.openwall.com \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/musl/
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 NNTP newsgroup(s).