X-Git-Url: https://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fgetloadavg.c;h=b27c3d4c49a538786b5d2ab306f5d5777a3de3ba;hb=7f284e211999d7ba633c864deafb428abe5ead16;hp=635e5ac534af828b5281f1044594f24b1e30deda;hpb=b8e3478a41e8e557bde8fb2d172ad0dc05b5b51b;p=gnulib.git diff --git a/lib/getloadavg.c b/lib/getloadavg.c index 635e5ac53..b27c3d4c4 100644 --- a/lib/getloadavg.c +++ b/lib/getloadavg.c @@ -1,5 +1,5 @@ /* 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 @@ -19,6 +19,14 @@ /* Compile-time symbols that this file uses: + HAVE_PSTAT_GETDYNAMIC Define this if your system has the + pstat_getdynamic function. I think it + is unique to HPUX9. The best way to get the + definition is through the AC_FUNC_GETLOADAVG + macro that comes with autoconf 2.13 or newer. + If that isn't an option, then just put + 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. LDAV_CVT() Scale the load average from the kernel. @@ -28,9 +36,6 @@ Must be defined unless one of apollo, DGUX, NeXT, or UMAX is defined; otherwise, no load average is available. - NLIST_STRUCT Include nlist.h, not a.out.h, and - the nlist n_name element is a pointer, - not an array. NLIST_NAME_UNION struct nlist has an n_un member, not n_name. LINUX_LDAV_FILE [__linux__]: File containing load averages. @@ -43,7 +48,7 @@ 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) @@ -52,7 +57,7 @@ UMAX UMAX4_3 VMS - WIN32 No-op for Windows95/NT. + WINDOWS32 No-op for Windows95/NT. __linux__ Linux: assumes /proc filesystem mounted. Support from Michael K. Johnson. __NetBSD__ NetBSD: assumes /kern filesystem mounted. @@ -90,8 +95,14 @@ extern int errno; #endif -#ifndef HAVE_GETLOADAVG +#if HAVE_LOCALE_H +# include +#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 @@ -159,6 +170,9 @@ extern int errno; # if defined (__osf__) && (defined (__alpha) || defined (__alpha__)) # define OSF_ALPHA +# include +# include +# include # include # endif @@ -270,7 +284,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 -# define FSCALE 1000.0 +# define FSCALE 1000.0 # endif # if defined (ardent) && defined (titan) @@ -288,71 +302,9 @@ extern int errno; # endif /* Not FSCALE. */ # if !defined (LDAV_CVT) && defined (FSCALE) -# define LDAV_CVT(n) (((double) (n)) / FSCALE) +# define LDAV_CVT(n) (((double) (n)) / FSCALE) # endif -/* VAX C can't handle multi-line #ifs, or lines longer that 256 characters. */ -# ifndef NLIST_STRUCT - -# ifdef MORE_BSD -# define NLIST_STRUCT -# endif - -# ifdef sun -# define NLIST_STRUCT -# endif - -# ifdef decstation -# define NLIST_STRUCT -# endif - -# ifdef hpux -# define NLIST_STRUCT -# endif - -# if defined (_SEQUENT_) || defined (sequent) -# define NLIST_STRUCT -# endif - -# ifdef sgi -# define NLIST_STRUCT -# endif - -# ifdef SVR4 -# define NLIST_STRUCT -# endif - -# ifdef sony_news -# define NLIST_STRUCT -# endif - -# ifdef OSF_ALPHA -# define NLIST_STRUCT -# endif - -# if defined (ardent) && defined (titan) -# define NLIST_STRUCT -# endif - -# ifdef tek4300 -# define NLIST_STRUCT -# endif - -# ifdef butterfly -# define NLIST_STRUCT -# endif - -# if defined(alliant) && defined(i860) /* Alliant FX/2800 */ -# define NLIST_STRUCT -# endif - -# ifdef _AIX -# define NLIST_STRUCT -# endif - -# endif /* defined (NLIST_STRUCT) */ - - # if defined(sgi) || (defined(mips) && !defined(BSD)) # define FIXUP_KERNEL_SYMBOL_ADDR(nl) ((nl)[0].n_value &= ~(1 << 31)) # endif @@ -395,11 +347,11 @@ extern int errno; # ifndef VMS # ifndef __linux__ -# ifndef NLIST_STRUCT +# ifndef HAVE_NLIST_H # include -# else /* NLIST_STRUCT */ +# else /* HAVE_NLIST_H */ # include -# endif /* NLIST_STRUCT */ +# endif /* HAVE_NLIST_H */ # ifdef SUNOS_5 # include @@ -436,6 +388,14 @@ extern int errno; # 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 @@ -535,7 +495,7 @@ getloadavg (loadavg, nelem) 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; @@ -580,7 +540,7 @@ getloadavg (loadavg, nelem) } 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. */ @@ -619,8 +579,11 @@ getloadavg (loadavg, nelem) 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]); + setlocale (LC_NUMERIC, ""); if (count < 1) return -1; @@ -818,7 +781,7 @@ getloadavg (loadavg, nelem) : (load_ave.tl_avenrun.l[0] / (double) load_ave.tl_lscale)); # endif /* OSF_MIPS */ -# if !defined (LDAV_DONE) && (defined (MSDOS) || defined (WIN32)) +# if !defined (LDAV_DONE) && (defined (__MSDOS__) || defined (WINDOWS32)) # define LDAV_DONE /* A faithful emulation is going to have to be saved for a rainy day. */ @@ -826,7 +789,7 @@ getloadavg (loadavg, nelem) { loadavg[elem] = 0.0; } -# endif /* MSDOS */ +# endif /* __MSDOS__ || WINDOWS32 */ # if !defined (LDAV_DONE) && defined (OSF_ALPHA) # define LDAV_DONE @@ -892,10 +855,10 @@ getloadavg (loadavg, nelem) if (offset == 0) { # ifndef sgi -# ifndef NLIST_STRUCT +# ifndef HAVE_NLIST_H strcpy (nl[0].n_name, LDAV_SYMBOL); strcpy (nl[1].n_name, ""); -# else /* NLIST_STRUCT */ +# else /* HAVE_NLIST_H */ # ifdef NLIST_NAME_UNION nl[0].n_un.n_name = LDAV_SYMBOL; nl[1].n_un.n_name = 0; @@ -903,7 +866,7 @@ getloadavg (loadavg, nelem) nl[0].n_name = LDAV_SYMBOL; nl[1].n_name = 0; # endif /* not NLIST_NAME_UNION */ -# endif /* NLIST_STRUCT */ +# endif /* HAVE_NLIST_H */ # ifndef SUNOS_5 if (