diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | misc/Makefile | 5 | ||||
| -rw-r--r-- | sysdeps/generic/getloadavg.c | 37 | ||||
| -rw-r--r-- | sysdeps/mach/getloadavg.c | 54 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/getloadavg.c | 64 |
5 files changed, 163 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index c41c509101..5b3e3547a4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 1999-10-04 Roland McGrath <roland@baalperazim.frob.com> + * misc/Makefile (routines): Add getloadavg. + * sysdeps/generic/getloadavg.c: New file. + * sysdeps/mach/getloadavg.c: New file. + * sysdeps/unix/sysv/linux/getloadavg.c: New file. + * sysdeps/generic/memrchr.c: New file, adapted from memchr.c. * sysdeps/i386/bits/string.h (__memrchr): New function. * string/string.h: Declare memrchr, __memrchr. diff --git a/misc/Makefile b/misc/Makefile index a1aeaa6c32..e469440e26 100644 --- a/misc/Makefile +++ b/misc/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1991, 92, 93, 94, 95, 96, 97, 98 Free Software Foundation, Inc. +# Copyright (C) 1991,92,93,94,95,96,97,98,99 Free Software Foundation, Inc. # This file is part of the GNU C Library. # The GNU C Library is free software; you can redistribute it and/or @@ -56,7 +56,8 @@ routines := brk sbrk sstk ioctl \ efgcvt efgcvt_r qefgcvt qefgcvt_r \ hsearch hsearch_r tsearch lsearch \ err error ustat \ - getsysstats dirname regexp + getsysstats dirname regexp \ + getloadavg include ../Makeconfig diff --git a/sysdeps/generic/getloadavg.c b/sysdeps/generic/getloadavg.c new file mode 100644 index 0000000000..ddbac7e483 --- /dev/null +++ b/sysdeps/generic/getloadavg.c @@ -0,0 +1,37 @@ +/* Get system load averages. Stub version. + Copyright (C) 1999 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#include <errno.h> +#include <unistd.h> +#include <stdlib.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. */ + +int +getloadavg (double loadavg[], int nelem) +{ + __set_errno (ENOSYS); + return -1; +} +stub_warning (getloadavg) +#include <stub-tag.h> diff --git a/sysdeps/mach/getloadavg.c b/sysdeps/mach/getloadavg.c new file mode 100644 index 0000000000..b185b6b62f --- /dev/null +++ b/sysdeps/mach/getloadavg.c @@ -0,0 +1,54 @@ +/* Get system load averages. Mach version. + Copyright (C) 1999 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#include <mach.h> +#include <mach/host_info.h> +#include <hurd.h> +#include <errno.h> +#include <unistd.h> +#include <stdlib.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. */ + +int +getloadavg (double loadavg[], int nelem) +{ + host_load_info_data_t info; + mach_msg_type_number_t size = HOST_LOAD_INFO_COUNT; + error_t err; + int i; + + err = __host_info (__mach_host_self (), HOST_LOAD_INFO, + (host_info_t) &info, &size); + if (err) + return __hurd_fail (err); + if (size < HOST_LOAD_INFO_COUNT) + return __hurd_fail (EGRATUITOUS); + + if (nelem > 3) + nelem = 3; + for (i = 0; i < nelem; ++i) + loadavg[i] = (double) info.avenrun[i] * (double) LOAD_SCALE; + + return i; +} diff --git a/sysdeps/unix/sysv/linux/getloadavg.c b/sysdeps/unix/sysv/linux/getloadavg.c new file mode 100644 index 0000000000..1612ad2e56 --- /dev/null +++ b/sysdeps/unix/sysv/linux/getloadavg.c @@ -0,0 +1,64 @@ +/* Get system load averages. Linux (/proc/loadavg) version. + Copyright (C) 1999 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#include <errno.h> +#include <unistd.h> +#include <fcntl.h> +#include <stdlib.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. */ + +int +getloadavg (double loadavg[], int nelem) +{ + int fd; + + fd = __open ("/proc/loadavg", O_RDONLY); + if (fd < 0) + return -1; + else + { + char buf[65], *p; + ssize_t nread; + int i; + + nread = __read (fd, buf, sizeof buf - 1); + close (fd); + if (nread < 0) + return -1; + buf[nread - 1] = '\0'; + + if (nelem > 3) + nelem = 3; + p = buf; + for (i = 0; i < nelem; ++i) + { + char *endp; + loadavg[i] = strtod (p, &endp); + if (!endp || endp == p) + break; + p = endp; + } + + return i; + } +} |