projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(jm_ICONV): Recommend GNU libiconv.
[gnulib.git]
/
lib
/
getloadavg.c
diff --git
a/lib/getloadavg.c
b/lib/getloadavg.c
index
b6824e4
..
e9c4c08
100644
(file)
--- a/
lib/getloadavg.c
+++ b/
lib/getloadavg.c
@@
-1,5
+1,5
@@
/* Get the system load averages.
/* Get the system load averages.
- Copyright (C) 1985, 86, 87, 88, 89, 91, 92, 93, 1994, 1995
+ Copyright (C) 1985, 86, 87, 88, 89, 91, 92, 93, 1994, 1995
, 1997
Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
@@
-51,7
+51,7
@@
DGUX
eunice UNIX emulator under VMS.
hpux
DGUX
eunice UNIX emulator under VMS.
hpux
-
MSDOS
No-op for MSDOS.
+
__MSDOS__
No-op for MSDOS.
NeXT
sgi
sequent Sequent Dynix 3.x.x (BSD)
NeXT
sgi
sequent Sequent Dynix 3.x.x (BSD)
@@
-60,7
+60,7
@@
UMAX
UMAX4_3
VMS
UMAX
UMAX4_3
VMS
- WIN
32
No-op for Windows95/NT.
+ WIN
DOWS32
No-op for Windows95/NT.
__linux__ Linux: assumes /proc filesystem mounted.
Support from Michael K. Johnson.
__NetBSD__ NetBSD: assumes /kern filesystem mounted.
__linux__ Linux: assumes /proc filesystem mounted.
Support from Michael K. Johnson.
__NetBSD__ NetBSD: assumes /kern filesystem mounted.
@@
-98,8
+98,14
@@
extern int errno;
#endif
extern int errno;
#endif
-#ifndef HAVE_GETLOADAVG
+#if HAVE_LOCALE_H
+# include <locale.h>
+#endif
+#if !HAVE_SETLOCALE
+# define setlocale(Category, Locale) /* empty */
+#endif
+#ifndef HAVE_GETLOADAVG
/* The existing Emacs configuration files define a macro called
LOAD_AVE_CVT, which accepts a value of type LOAD_AVE_TYPE, and
/* The existing Emacs configuration files define a macro called
LOAD_AVE_CVT, which accepts a value of type LOAD_AVE_TYPE, and
@@
-167,6
+173,9
@@
extern int errno;
# if defined (__osf__) && (defined (__alpha) || defined (__alpha__))
# define OSF_ALPHA
# if defined (__osf__) && (defined (__alpha) || defined (__alpha__))
# define OSF_ALPHA
+# include <sys/mbuf.h>
+# include <sys/socket.h>
+# include <net/route.h>
# include <sys/table.h>
# endif
# include <sys/table.h>
# endif
@@
-278,7
+287,7
@@
extern int errno;
/* Sometimes both MIPS and sgi are defined, so FSCALE was just defined
above under #ifdef MIPS. But we want the sgi value. */
# undef FSCALE
/* Sometimes both MIPS and sgi are defined, so FSCALE was just defined
above under #ifdef MIPS. But we want the sgi value. */
# undef FSCALE
-# define
FSCALE 1000.0
+# define FSCALE 1000.0
# endif
# if defined (ardent) && defined (titan)
# endif
# if defined (ardent) && defined (titan)
@@
-296,7
+305,13
@@
extern int errno;
# endif /* Not FSCALE. */
# if !defined (LDAV_CVT) && defined (FSCALE)
# endif /* Not FSCALE. */
# if !defined (LDAV_CVT) && defined (FSCALE)
-# define LDAV_CVT(n) (((double) (n)) / FSCALE)
+# define LDAV_CVT(n) (((double) (n)) / FSCALE)
+# endif
+
+# ifndef NLIST_STRUCT
+# if HAVE_NLIST_H
+# define NLIST_STRUCT
+# endif
# endif
/* VAX C can't handle multi-line #ifs, or lines longer that 256 characters. */
# endif
/* VAX C can't handle multi-line #ifs, or lines longer that 256 characters. */
@@
-444,6
+459,14
@@
extern int errno;
# endif /* LOAD_AVE_TYPE */
# endif /* LOAD_AVE_TYPE */
+# if defined(__GNU__) && !defined (NeXT)
+/* Note that NeXT Openstep defines __GNU__ even though it should not. */
+/* GNU system acts much like NeXT, for load average purposes,
+ but not exactly. */
+# define NeXT
+# define host_self mach_host_self
+# endif
+
# ifdef NeXT
# ifdef HAVE_MACH_MACH_H
# include <mach/mach.h>
# ifdef NeXT
# ifdef HAVE_MACH_MACH_H
# include <mach/mach.h>
@@
-543,7
+566,7
@@
getloadavg (loadavg, nelem)
elem = -1;
# endif
elem = -1;
# endif
-# if !defined (LDAV_DONE) && defined (
SUNOS_5
)
+# if !defined (LDAV_DONE) && defined (
HAVE_LIBKSTAT
)
/* Use libkstat because we don't have to be root. */
# define LDAV_DONE
kstat_ctl_t *kc;
/* Use libkstat because we don't have to be root. */
# define LDAV_DONE
kstat_ctl_t *kc;
@@
-588,7
+611,7
@@
getloadavg (loadavg, nelem)
}
kstat_close (kc);
}
kstat_close (kc);
-# endif /*
SUNOS_5
*/
+# endif /*
HAVE_LIBKSTAT
*/
# if !defined (LDAV_DONE) && defined (hpux) && defined (HAVE_PSTAT_GETDYNAMIC)
/* Use pstat_getdynamic() because we don't have to be root. */
# if !defined (LDAV_DONE) && defined (hpux) && defined (HAVE_PSTAT_GETDYNAMIC)
/* Use pstat_getdynamic() because we don't have to be root. */
@@
-627,8
+650,11
@@
getloadavg (loadavg, nelem)
if (count <= 0)
return -1;
if (count <= 0)
return -1;
+ /* The following sscanf must use the C locale. */
+ setlocale (LC_NUMERIC, "C");
count = sscanf (ldavgbuf, "%lf %lf %lf",
&load_ave[0], &load_ave[1], &load_ave[2]);
count = sscanf (ldavgbuf, "%lf %lf %lf",
&load_ave[0], &load_ave[1], &load_ave[2]);
+ setlocale (LC_NUMERIC, "");
if (count < 1)
return -1;
if (count < 1)
return -1;
@@
-826,7
+852,7
@@
getloadavg (loadavg, nelem)
: (load_ave.tl_avenrun.l[0] / (double) load_ave.tl_lscale));
# endif /* OSF_MIPS */
: (load_ave.tl_avenrun.l[0] / (double) load_ave.tl_lscale));
# endif /* OSF_MIPS */
-# if !defined (LDAV_DONE) && (defined (
MSDOS) || defined (WIN
32))
+# if !defined (LDAV_DONE) && (defined (
__MSDOS__) || defined (WINDOWS
32))
# define LDAV_DONE
/* A faithful emulation is going to have to be saved for a rainy day. */
# define LDAV_DONE
/* A faithful emulation is going to have to be saved for a rainy day. */
@@
-834,7
+860,7
@@
getloadavg (loadavg, nelem)
{
loadavg[elem] = 0.0;
}
{
loadavg[elem] = 0.0;
}
-# endif /*
MSDOS
*/
+# endif /*
__MSDOS__ || WINDOWS32
*/
# if !defined (LDAV_DONE) && defined (OSF_ALPHA)
# define LDAV_DONE
# if !defined (LDAV_DONE) && defined (OSF_ALPHA)
# define LDAV_DONE