21 May
2022
21 May
'22
2:49 a.m.
This borrows getloadavg.c from musl.
getloadavg pops up often. Recently llvm and rust are dependent on it.
glibc and musl have it and no-one actually checks if it's available in your libc.
It's just become way easier to add it in uclibc-ng rather than patch everything else.
Signed-off-by: Lance Fredrickson <lancethepants(a)gmail.com>
---
include/stdlib.h | 2 +-
libc/misc/Makefile.in | 1 +
libc/misc/getloadavg/Makefile | 13 +++++++++++
libc/misc/getloadavg/Makefile.in | 23 ++++++++++++++++++
libc/misc/getloadavg/getloadavg.c | 39 +++++++++++++++++++++++++++++++
5 files changed, 77 insertions(+), 1 deletion(-)
create mode 100644 libc/misc/getloadavg/Makefile
create mode 100644 libc/misc/getloadavg/Makefile.in
create mode 100644 libc/misc/getloadavg/getloadavg.c
diff --git a/include/stdlib.h b/include/stdlib.h
index 6a253cc3f..987fe2223 100644
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -979,7 +979,7 @@ extern int getpt (void);
# endif
#endif
-#if 0 /* def __USE_BSD */
+#ifdef __USE_BSD
/* 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
three, but may be less than NELEM), or -1 if an error occurred. */
diff --git a/libc/misc/Makefile.in b/libc/misc/Makefile.in
index e45002e60..53bb6d6c8 100644
--- a/libc/misc/Makefile.in
+++ b/libc/misc/Makefile.in
@@ -14,6 +14,7 @@ include $(top_srcdir)libc/misc/file/Makefile.in
include $(top_srcdir)libc/misc/fnmatch/Makefile.in
include $(top_srcdir)libc/misc/ftw/Makefile.in
include $(top_srcdir)libc/misc/fts/Makefile.in
+include $(top_srcdir)libc/misc/getloadavg/Makefile.in
include $(top_srcdir)libc/misc/glob/Makefile.in
include $(top_srcdir)libc/misc/internals/Makefile.in
include $(top_srcdir)libc/misc/locale/Makefile.in
diff --git a/libc/misc/getloadavg/Makefile b/libc/misc/getloadavg/Makefile
new file mode 100644
index 000000000..4a8f4a072
--- /dev/null
+++ b/libc/misc/getloadavg/Makefile
@@ -0,0 +1,13 @@
+# Makefile for uClibc
+#
+# Copyright (C) 2000-2005 Erik Andersen <andersen(a)uclibc.org>
+#
+# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
+#
+
+top_srcdir=../../../
+top_builddir=../../../
+all: objs
+include $(top_builddir)Rules.mak
+include Makefile.in
+include $(top_srcdir)Makerules
diff --git a/libc/misc/getloadavg/Makefile.in b/libc/misc/getloadavg/Makefile.in
new file mode 100644
index 000000000..3c8ca24f0
--- /dev/null
+++ b/libc/misc/getloadavg/Makefile.in
@@ -0,0 +1,23 @@
+# Makefile for uClibc
+#
+# Copyright (C) 2000-2008 Erik Andersen <andersen(a)uclibc.org>
+#
+# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
+#
+
+subdirs += libc/misc/getloadavg
+
+CSRC-y := getloadavg.c
+
+MISC_GETLOADAVG_DIR := $(top_srcdir)libc/misc/getloadavg
+MISC_GETLOADAVG_OUT := $(top_builddir)libc/misc/getloadavg
+
+MISC_GETLOADAVG_SRC := $(patsubst %.c,$(MISC_GETLOADAVG_DIR)/%.c,$(CSRC-y))
+MISC_GETLOADAVG_OBJ := $(patsubst %.c,$(MISC_GETLOADAVG_OUT)/%.o,$(CSRC-y))
+
+libc-y += $(MISC_GETLOADAVG_OBJ)
+
+objclean-y += CLEAN_libc/misc/getloadavg
+
+CLEAN_libc/misc/getloadavg:
+ $(do_rm) $(addprefix $(MISC_GETLOADAVG_OUT)/*., o os)
diff --git a/libc/misc/getloadavg/getloadavg.c b/libc/misc/getloadavg/getloadavg.c
new file mode 100644
index 000000000..2aee565c0
--- /dev/null
+++ b/libc/misc/getloadavg/getloadavg.c
@@ -0,0 +1,39 @@
+/*
+ * Copyright © 2005-2020 Rich Felker, et al.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Imported from musl C library
+ */
+
+#define _GNU_SOURCE
+#include <stdlib.h>
+#include <sys/sysinfo.h>
+
+int getloadavg(double *a, int n)
+{
+ 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.20.1