projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* lib/readutmp.c (desirable_utmp_entry): Use "bool" as the
[gnulib.git]
/
lib
/
getloadavg.c
diff --git
a/lib/getloadavg.c
b/lib/getloadavg.c
index
b4b4e75
..
cfa6273
100644
(file)
--- a/
lib/getloadavg.c
+++ b/
lib/getloadavg.c
@@
-1,7
+1,8
@@
/* Get the system load averages.
Copyright (C) 1985, 1986, 1987, 1988, 1989, 1991, 1992, 1993, 1994,
/* Get the system load averages.
Copyright (C) 1985, 1986, 1987, 1988, 1989, 1991, 1992, 1993, 1994,
- 1995, 1997, 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
+ 1995, 1997, 1999, 2000, 2003, 2004, 2005, 2006 Free Software
+ Foundation, Inc.
NOTE: The canonical source of this file is maintained with gnulib.
Bugs can be reported to bug-gnulib@gnu.org.
NOTE: The canonical source of this file is maintained with gnulib.
Bugs can be reported to bug-gnulib@gnu.org.
@@
-18,7
+19,7
@@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 5
9 Temple Place - Suite 330, Boston, MA 02111-1307
,
+ Foundation, Inc., 5
1 Franklin Street, Fifth Floor, Boston, MA 02110-1301
,
USA. */
/* Compile-time symbols that this file uses:
USA. */
/* Compile-time symbols that this file uses:
@@
-32,7
+33,7
@@
AC_CHECK_FUNCS(pstat_getdynamic) in your
configure.in file.
FIXUP_KERNEL_SYMBOL_ADDR() Adjust address in returned struct nlist.
AC_CHECK_FUNCS(pstat_getdynamic) in your
configure.in file.
FIXUP_KERNEL_SYMBOL_ADDR() Adjust address in returned struct nlist.
- KERNEL_FILE
Pathname of the kernel
to nlist.
+ KERNEL_FILE
Name of the kernel file
to nlist.
LDAV_CVT() Scale the load average from the kernel.
Returns a double.
LDAV_SYMBOL Name of kernel symbol giving load average.
LDAV_CVT() Scale the load average from the kernel.
Returns a double.
LDAV_SYMBOL Name of kernel symbol giving load average.
@@
-47,7
+48,8
@@
the nlist n_name element is a pointer,
not an array.
HAVE_STRUCT_NLIST_N_UN_N_NAME `n_un.n_name' is member of `struct nlist'.
the nlist n_name element is a pointer,
not an array.
HAVE_STRUCT_NLIST_N_UN_N_NAME `n_un.n_name' is member of `struct nlist'.
- LINUX_LDAV_FILE [__linux__]: File containing load averages.
+ LINUX_LDAV_FILE [__linux__, __CYGWIN__]: File containing
+ load averages.
Specific system predefines this file uses, aside from setting
default values if not emacs:
Specific system predefines this file uses, aside from setting
default values if not emacs:
@@
-70,6
+72,7
@@
WINDOWS32 No-op for Windows95/NT.
__linux__ Linux: assumes /proc file system mounted.
Support from Michael K. Johnson.
WINDOWS32 No-op for Windows95/NT.
__linux__ Linux: assumes /proc file system mounted.
Support from Michael K. Johnson.
+ __CYGWIN__ Cygwin emulates linux /proc/loadavg.
__NetBSD__ NetBSD: assumes /kern file system mounted.
In addition, to avoid nesting many #ifdefs, we internally set
__NetBSD__ NetBSD: assumes /kern file system mounted.
In addition, to avoid nesting many #ifdefs, we internally set
@@
-78,13
+81,15
@@
We also #define LDAV_PRIVILEGED if a program will require
special installation to be able to call getloadavg. */
We also #define LDAV_PRIVILEGED if a program will require
special installation to be able to call getloadavg. */
-/* This should always be first. */
-#ifdef HAVE_CONFIG_H
+/* "configure" defines CONFIGURING_GETLOADAVG to sidestep problems
+ with partially-configured source directories. */
+
+#ifndef CONFIGURING_GETLOADAVG
# include <config.h>
# include <config.h>
+# include <stdbool.h>
#endif
#include <errno.h>
#endif
#include <errno.h>
-#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.h>
@@
-277,7
+282,7
@@
# endif
# endif
-# ifndef
FSCALE
+# ifndef FSCALE
/* SunOS and some others define FSCALE in sys/param.h. */
/* SunOS and some others define FSCALE in sys/param.h. */
@@
-346,9
+351,7
@@
# define LDAV_SYMBOL "avenrun"
# endif
# define LDAV_SYMBOL "avenrun"
# endif
-# ifdef HAVE_UNISTD_H
-# include <unistd.h>
-# endif
+# include <unistd.h>
/* LOAD_AVE_TYPE should only get defined if we're going to use the
nlist method. */
/* LOAD_AVE_TYPE should only get defined if we're going to use the
nlist method. */
@@
-358,7
+361,7
@@
# ifdef LOAD_AVE_TYPE
# ifdef LOAD_AVE_TYPE
-# ifndef VMS
+# ifndef
__
VMS
# ifndef __linux__
# ifndef NLIST_STRUCT
# include <a.out.h>
# ifndef __linux__
# ifndef NLIST_STRUCT
# include <a.out.h>
@@
-385,7
+388,7
@@
# endif /* LDAV_SYMBOL */
# endif /* __linux__ */
# endif /* LDAV_SYMBOL */
# endif /* __linux__ */
-# else /* VMS */
+# else /*
__
VMS */
# ifndef eunice
# include <iodef.h>
# ifndef eunice
# include <iodef.h>
@@
-393,7
+396,7
@@
# else /* eunice */
# include <vms/iodef.h>
# endif /* eunice */
# else /* eunice */
# include <vms/iodef.h>
# endif /* eunice */
-# endif /* VMS */
+# endif /*
__
VMS */
# ifndef LDAV_CVT
# define LDAV_CVT(n) ((double) (n))
# ifndef LDAV_CVT
# define LDAV_CVT(n) ((double) (n))
@@
-447,13
+450,7
@@
# include <sys/dg_sys_info.h>
# endif
# include <sys/dg_sys_info.h>
# endif
-# if defined (HAVE_FCNTL_H) || defined (_POSIX_VERSION)
-# include <fcntl.h>
-# else
-# include <sys/file.h>
-# endif
-
-# include "unistd-safer.h"
+# include "fcntl--.h"
\f
/* Avoid static vars inside a function since in HPUX they dump as pure. */
\f
/* Avoid static vars inside a function since in HPUX they dump as pure. */
@@
-479,9
+476,9
@@
static bool getloadavg_initialized;
/* Offset in kmem to seek to read load average, or 0 means invalid. */
static long offset;
/* Offset in kmem to seek to read load average, or 0 means invalid. */
static long offset;
-# if !
defined (VMS) && !defined (sgi) && !defined (__linux__)
+# if !
defined __VMS && ! defined sgi && ! defined __linux__
static struct nlist nl[2];
static struct nlist nl[2];
-# endif
/* Not VMS or sgi */
+# endif
# ifdef SUNOS_5
static kvm_t *kd;
# ifdef SUNOS_5
static kvm_t *kd;
@@
-571,7
+568,7
@@
getloadavg (double loadavg[], int nelem)
# endif /* hpux && HAVE_PSTAT_GETDYNAMIC */
# endif /* hpux && HAVE_PSTAT_GETDYNAMIC */
-# if !defined (LDAV_DONE) &&
defined (__linux__
)
+# if !defined (LDAV_DONE) &&
(defined (__linux__) || defined (__CYGWIN__)
)
# define LDAV_DONE
# undef LOAD_AVE_TYPE
# define LDAV_DONE
# undef LOAD_AVE_TYPE
@@
-579,7
+576,7
@@
getloadavg (double loadavg[], int nelem)
# define LINUX_LDAV_FILE "/proc/loadavg"
# endif
# define LINUX_LDAV_FILE "/proc/loadavg"
# endif
- char ldavgbuf[3 * (INT_STRLEN_BOUND (
long int) + sizeof ".00
")];
+ char ldavgbuf[3 * (INT_STRLEN_BOUND (
int) + sizeof ".00
")];
char const *ptr = ldavgbuf;
int fd, count;
char const *ptr = ldavgbuf;
int fd, count;
@@
-608,7
+605,7
@@
getloadavg (double loadavg[], int nelem)
return elem;
return elem;
-# endif /* __linux__ */
+# endif /* __linux__
|| __CYGWIN__
*/
# if !defined (LDAV_DONE) && defined (__NetBSD__)
# define LDAV_DONE
# if !defined (LDAV_DONE) && defined (__NetBSD__)
# define LDAV_DONE
@@
-819,7
+816,7
@@
getloadavg (double loadavg[], int nelem)
: (load_ave.tl_avenrun.l[elem] / (double) load_ave.tl_lscale));
# endif /* OSF_ALPHA */
: (load_ave.tl_avenrun.l[elem] / (double) load_ave.tl_lscale));
# endif /* OSF_ALPHA */
-# if !
defined (LDAV_DONE) && defined (VMS)
+# if !
defined LDAV_DONE && defined __VMS
/* VMS specific code -- read from the Load Ave driver. */
LOAD_AVE_TYPE load_ave[3];
/* VMS specific code -- read from the Load Ave driver. */
LOAD_AVE_TYPE load_ave[3];
@@
-857,9
+854,9
@@
getloadavg (double loadavg[], int nelem)
if (!getloadavg_initialized)
return -1;
if (!getloadavg_initialized)
return -1;
-# endif /* VMS */
+# endif /*
! defined LDAV_DONE && defined __
VMS */
-# if !
defined (LDAV_DONE) && defined (LOAD_AVE_TYPE) && !defined (VMS)
+# if !
defined LDAV_DONE && defined LOAD_AVE_TYPE && ! defined __VMS
/* UNIX-specific code -- read the average from /dev/kmem. */
/* UNIX-specific code -- read the average from /dev/kmem. */
@@
-913,7
+910,7
@@
getloadavg (double loadavg[], int nelem)
if (!getloadavg_initialized)
{
# ifndef SUNOS_5
if (!getloadavg_initialized)
{
# ifndef SUNOS_5
- channel =
fd_safer (open ("/dev/kmem", O_RDONLY)
);
+ channel =
open ("/dev/kmem", O_RDONLY
);
if (channel >= 0)
{
/* Set the channel to close on exec, so it does not
if (channel >= 0)
{
/* Set the channel to close on exec, so it does not
@@
-959,7
+956,7
@@
getloadavg (double loadavg[], int nelem)
if (offset == 0 || !getloadavg_initialized)
return -1;
if (offset == 0 || !getloadavg_initialized)
return -1;
-# endif /*
LOAD_AVE_TYPE and not
VMS */
+# endif /*
! defined LDAV_DONE && defined LOAD_AVE_TYPE && ! defined __
VMS */
# if !defined (LDAV_DONE) && defined (LOAD_AVE_TYPE) /* Including VMS. */
if (nelem > 0)
# if !defined (LDAV_DONE) && defined (LOAD_AVE_TYPE) /* Including VMS. */
if (nelem > 0)
@@
-972,14
+969,13
@@
getloadavg (double loadavg[], int nelem)
# define LDAV_DONE
# endif /* !LDAV_DONE && LOAD_AVE_TYPE */
# define LDAV_DONE
# endif /* !LDAV_DONE && LOAD_AVE_TYPE */
-# ifdef LDAV_DONE
- return elem;
-# else
+# if !defined LDAV_DONE
/* Set errno to zero to indicate that there was no particular error;
this function just can't work at all on this system. */
errno = 0;
/* Set errno to zero to indicate that there was no particular error;
this function just can't work at all on this system. */
errno = 0;
-
return
-1;
+
elem =
-1;
# endif
# endif
+ return elem;
}
#endif /* ! HAVE_GETLOADAVG */
}
#endif /* ! HAVE_GETLOADAVG */