From: Paul Eggert Date: Thu, 10 Feb 2011 07:41:44 +0000 (-0800) Subject: [admin/ChangeLog] X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~794^2~17 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=90e04ea245917ca1d9856f1354c074991e99db7f;p=emacs.git [admin/ChangeLog] Remove no-longer needed getloadavg symbols. * CPP-DEFINES (LOAD_AVE_CVT, LOAD_AVE_TYPE, FSCALE, KERNEL_FILE): (LDAV_SYMBOL): Remove. [src/ChangeLog] Remove no-longer needed getloadavg symbols. * m/alpha.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove. * m/amdx86-64.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove. * m/ia64.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove. * m/ibms390.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove. * m/macppc.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove. * m/sparc.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove. * m/template.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove. * m/vax.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove. * s/aix4-2.h (KERNEL_FILE, LDAV_SYMBOL): Remove. * s/bsd-common.h (KERNEL_FILE, LDAV_SYMBOL): Remove #undef. * s/hpux10-20.h (KERNEL_FILE, LOAD_AVE_TYPE, LOAD_AVE_CVT): (LDAV_SYMBOL): Remove. * s/unixware.h (LOAD_AVE_TYPE, LOAD_AVE_CVT, FSCALE): Remove. * s/usg5-4-common.h (KERNEL_FILE, LDAV_SYMBOL): Remove. --- diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES index 7febc93bb33..dae6202b4e4 100644 --- a/admin/CPP-DEFINES +++ b/admin/CPP-DEFINES @@ -62,8 +62,6 @@ SIGTYPE SYSTEM_TYPE ** Machine specific macros, decribed in detail in src/m/template.h -LOAD_AVE_CVT -LOAD_AVE_TYPE VIRT_ADDR_VARIES ** Misc macros @@ -111,7 +109,6 @@ EMACS_INT EMACS_UINT FILE_SYSTEM_CASE FLOAT_CHECK_DOMAIN -FSCALE GC_LISP_OBJECT_ALIGNMENT GC_MARK_SECONDARY_STACK GC_MARK_STACK @@ -193,8 +190,6 @@ HPUX INTERNAL_TERMINAL IS_ANY_SEP IS_DIRECTORY_SEP -KERNEL_FILE -LDAV_SYMBOL LINKER LINUX_VERSION_CODE LISP_FLOAT_TYPE @@ -381,4 +376,3 @@ vfork wait write xfree - diff --git a/admin/ChangeLog b/admin/ChangeLog index 0ca88ee84d5..ce7ff76aa2c 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,3 +1,9 @@ +2011-02-10 Paul Eggert + + Remove no-longer needed getloadavg symbols. + * CPP-DEFINES (LOAD_AVE_CVT, LOAD_AVE_TYPE, FSCALE, KERNEL_FILE): + (LDAV_SYMBOL): Remove. + 2011-02-05 Glenn Morris * bzrmerge.el (bzrmerge-warning-buffer): New constant. diff --git a/src/ChangeLog b/src/ChangeLog index ccb54ffffa7..635a2d72f9c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,21 @@ 2011-02-10 Paul Eggert + Remove no-longer needed getloadavg symbols. + * m/alpha.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove. + * m/amdx86-64.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove. + * m/ia64.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove. + * m/ibms390.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove. + * m/macppc.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove. + * m/sparc.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove. + * m/template.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove. + * m/vax.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove. + * s/aix4-2.h (KERNEL_FILE, LDAV_SYMBOL): Remove. + * s/bsd-common.h (KERNEL_FILE, LDAV_SYMBOL): Remove #undef. + * s/hpux10-20.h (KERNEL_FILE, LOAD_AVE_TYPE, LOAD_AVE_CVT): + (LDAV_SYMBOL): Remove. + * s/unixware.h (LOAD_AVE_TYPE, LOAD_AVE_CVT, FSCALE): Remove. + * s/usg5-4-common.h (KERNEL_FILE, LDAV_SYMBOL): Remove. + Import getloadavg module from gnulib. * deps.mk (getloadavg.o): Remove; gnulib now does this. * lisp.h (getloadavg) [!defined HAVE_GETLOADAVG]: Remove; gnulib diff --git a/src/m/alpha.h b/src/m/alpha.h index 9ae089bfc5b..3a27cfd65d9 100644 --- a/src/m/alpha.h +++ b/src/m/alpha.h @@ -29,12 +29,6 @@ along with GNU Emacs. If not, see . */ /* __alpha defined automatically */ -/* Data type of load average, as read out of kmem. */ -#define LOAD_AVE_TYPE long - -/* Convert that into an integer that is 100 for a load average of 1.0 */ -#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE) - #ifdef __ELF__ #if !defined(GNU_LINUX) && !defined(__NetBSD__) @@ -57,4 +51,3 @@ along with GNU Emacs. If not, see . */ Define DBL_MIN_REPLACEMENT to be the next value larger than DBL_MIN: this avoids the assembler bug. */ #define DBL_MIN_REPLACEMENT 2.2250738585072019e-308 - diff --git a/src/m/amdx86-64.h b/src/m/amdx86-64.h index 2ae5d07390f..441f41b4444 100644 --- a/src/m/amdx86-64.h +++ b/src/m/amdx86-64.h @@ -30,12 +30,5 @@ along with GNU Emacs. If not, see . */ #define EMACS_INT long #define EMACS_UINT unsigned long -/* Data type of load average, as read out of kmem. */ -#define LOAD_AVE_TYPE long - -/* Convert that into an integer that is 100 for a load average of 1.0 */ -#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE) - /* Define XPNTR to avoid or'ing with DATA_SEG_BITS */ #undef DATA_SEG_BITS - diff --git a/src/m/ia64.h b/src/m/ia64.h index 48ba3005cd6..101d56e648b 100644 --- a/src/m/ia64.h +++ b/src/m/ia64.h @@ -30,12 +30,6 @@ along with GNU Emacs. If not, see . */ #define EMACS_INT long #define EMACS_UINT unsigned long -/* Data type of load average, as read out of kmem. */ -#define LOAD_AVE_TYPE long - -/* Convert that into an integer that is 100 for a load average of 1.0 */ -#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE) - #ifdef REL_ALLOC #ifndef _MALLOC_INTERNAL /* "char *" because ralloc.c defines it that way. gmalloc.c thinks it @@ -45,4 +39,3 @@ extern char *r_alloc (), *r_re_alloc (); extern void r_alloc_free (); #endif /* not _MALLOC_INTERNAL */ #endif /* REL_ALLOC */ - diff --git a/src/m/ibms390.h b/src/m/ibms390.h index f2aef1ba513..c309035dc5c 100644 --- a/src/m/ibms390.h +++ b/src/m/ibms390.h @@ -18,12 +18,6 @@ You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see . */ -/* Data type of load average, as read out of kmem. */ -#define LOAD_AVE_TYPE long - -/* Convert that into an integer that is 100 for a load average of 1.0 */ -#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE) - /* Define VIRT_ADDR_VARIES if the virtual addresses of pure and impure space as loaded can vary, and even their relative order cannot be relied on. @@ -31,4 +25,3 @@ along with GNU Emacs. If not, see . */ Otherwise Emacs assumes that text space precedes data space, numerically. */ #define VIRT_ADDR_VARIES - diff --git a/src/m/macppc.h b/src/m/macppc.h index 5d78e39bdba..aef781e2c39 100644 --- a/src/m/macppc.h +++ b/src/m/macppc.h @@ -17,15 +17,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see . */ -/* Data type of load average, as read out of kmem. */ -#define LOAD_AVE_TYPE long - -/* Convert that into an integer that is 100 for a load average of 1.0 */ -#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE) - #ifdef _ARCH_PPC64 #ifndef _LP64 #define _LP64 #endif #endif - diff --git a/src/m/sparc.h b/src/m/sparc.h index 50e56f0f3dc..99668043f30 100644 --- a/src/m/sparc.h +++ b/src/m/sparc.h @@ -19,12 +19,6 @@ along with GNU Emacs. If not, see . */ /* __sparc__ is defined by the compiler by default. */ -/* Data type of load average, as read out of kmem. */ -#define LOAD_AVE_TYPE long - -/* Convert that into an integer that is 100 for a load average of 1.0 */ -#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE) - #ifdef __arch64__ /* GCC, 64-bit ABI. */ #define BITS_PER_LONG 64 @@ -34,4 +28,3 @@ along with GNU Emacs. If not, see . */ #endif #endif /* __arch64__ */ - diff --git a/src/m/template.h b/src/m/template.h index f06f62b6cda..54fb0da9521 100644 --- a/src/m/template.h +++ b/src/m/template.h @@ -21,12 +21,6 @@ along with GNU Emacs. If not, see . */ does not define it automatically. Ones defined so far include m68k and many others */ -/* Data type of load average, as read out of kmem. */ -#define LOAD_AVE_TYPE long - -/* Convert that into an integer that is 100 for a load average of 1.0 */ -#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE) - /* Define VIRT_ADDR_VARIES if the virtual addresses of pure and impure space as loaded can vary, and even their relative order cannot be relied on. @@ -46,4 +40,3 @@ along with GNU Emacs. If not, see . */ If you've just fixed a problem in an existing configuration file, you should also check `etc/MACHINES' to make sure its descriptions of known problems in that configuration should be updated. */ - diff --git a/src/m/vax.h b/src/m/vax.h index 2fecf17ca84..a375600cead 100644 --- a/src/m/vax.h +++ b/src/m/vax.h @@ -20,14 +20,4 @@ along with GNU Emacs. If not, see . */ /* #define vax -- appears to be done automatically */ -/* USG systems I know of running on Vaxes do not actually - support the load average, so disable it for them. */ - -/* Data type of load average, as read out of kmem. */ -#define LOAD_AVE_TYPE double - -/* Convert that into an integer that is 100 for a load average of 1.0 */ -#define LOAD_AVE_CVT(x) ((int) ((x) * 100.0)) - #define HAVE_FTIME - diff --git a/src/s/aix4-2.h b/src/s/aix4-2.h index c62aee249c5..443fc034570 100644 --- a/src/s/aix4-2.h +++ b/src/s/aix4-2.h @@ -41,12 +41,6 @@ along with GNU Emacs. If not, see . */ /* Define HAVE_SOCKETS if system supports 4.2-compatible sockets. */ #define HAVE_SOCKETS - -/* The file containing the kernel's symbol table is called /unix. */ -#define KERNEL_FILE "/unix" - -/* The kernel symbol where the load average is found is named avenrun. */ -#define LDAV_SYMBOL "avenrun" /* Special items needed to make Emacs run on this system. */ @@ -86,4 +80,3 @@ along with GNU Emacs. If not, see . */ Emacs currently calls xrealloc on the results of get_current_dir name, to avoid a crash just use the Emacs implementation for that function. */ #define BROKEN_GET_CURRENT_DIR_NAME 1 - diff --git a/src/s/bsd-common.h b/src/s/bsd-common.h index 7d472c83ed1..0cca005b423 100644 --- a/src/s/bsd-common.h +++ b/src/s/bsd-common.h @@ -37,10 +37,6 @@ along with GNU Emacs. If not, see . */ #define TABDLY OXTABS #define TAB3 OXTABS -/* These aren't needed, since we have getloadavg. */ -#undef KERNEL_FILE -#undef LDAV_SYMBOL - #define NO_TERMIO /* If the system's imake configuration file defines `NeedWidePrototypes' @@ -72,12 +68,5 @@ along with GNU Emacs. If not, see . */ a file that someone else has modified in his Emacs. */ #define CLASH_DETECTION -/* The file containing the kernel's symbol table is called /vmunix. */ -#define KERNEL_FILE "/vmunix" - -/* The kernel symbol where the load average is found is named _avenrun. */ -#define LDAV_SYMBOL "_avenrun" - /* Send signals to subprocesses by "typing" special chars at them. */ #define SIGNALS_VIA_CHARACTERS - diff --git a/src/s/hpux10-20.h b/src/s/hpux10-20.h index d745f8d09c4..1cd91a41b55 100644 --- a/src/s/hpux10-20.h +++ b/src/s/hpux10-20.h @@ -47,9 +47,6 @@ along with GNU Emacs. If not, see . */ a file that someone else has modified in his Emacs. */ #define CLASH_DETECTION -/* The symbol in the kernel where the load average is found - depends on the cpu type, so we let the m- files define LDAV_SYMBOL. */ - /* Special hacks needed to make Emacs run on this system. */ /* In hpux, the symbol SIGIO is defined, but the feature @@ -91,9 +88,6 @@ along with GNU Emacs. If not, see . */ #undef random #undef HAVE_RANDOM -/* AlainF 20-Jul-1996 says this is right. */ -#define KERNEL_FILE "/stand/vmunix" - /* Rainer Malzbender says definining HAVE_XRMSETDATABASE allows Emacs to compile on HP-UX 10.20 using GCC. */ @@ -119,18 +113,3 @@ along with GNU Emacs. If not, see . */ #define DATA_SEG_BITS 0x40000000 #define DATA_START 0x40000000 - -/* Data type of load average, as read out of kmem. */ -#define LOAD_AVE_TYPE double - -/* Convert that into an integer that is 100 for a load average of 1.0 */ -#define LOAD_AVE_CVT(x) ((int) (x * 100.0)) - -/* The kernel symbol where the load average is found is named _avenrun. - At this time there are two major flavors of hp-ux (there is the s800 - and s300 (s200) flavors). The differences are thusly moved to the - corresponding machine description file. */ - -/* No underscore please. */ -#define LDAV_SYMBOL "avenrun" - diff --git a/src/s/unixware.h b/src/s/unixware.h index c6130669a9a..407282ff78c 100644 --- a/src/s/unixware.h +++ b/src/s/unixware.h @@ -49,14 +49,4 @@ along with GNU Emacs. If not, see . */ pty_name[sizeof(pty_name) - 1] = 0; \ } -/* Data type of load average, as read out of kmem. */ -#define LOAD_AVE_TYPE long - -/* Convert that into an integer that is 100 for a load average of 1.0 */ -/* This is totally uncalibrated. */ -#define LOAD_AVE_CVT(x) ((int) (((double) (x)) * 100.0 / FSCALE)) -#define FSCALE 256.0 - - #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->__ptr - (FILE)->__base) - diff --git a/src/s/usg5-4-common.h b/src/s/usg5-4-common.h index 12f73c1b3b5..aeedd7f4b15 100644 --- a/src/s/usg5-4-common.h +++ b/src/s/usg5-4-common.h @@ -30,12 +30,6 @@ along with GNU Emacs. If not, see . */ It sets the Lisp variable system-type. */ #define SYSTEM_TYPE "usg-unix-v" -/* The file containing the kernel's symbol table is called /unix. */ -#define KERNEL_FILE "/unix" - -/* The kernel symbol where the load average is found is named avenrun. */ -#define LDAV_SYMBOL "avenrun" - /* setjmp and longjmp can safely replace _setjmp and _longjmp, but they will run slower. */ #define _setjmp setjmp @@ -105,4 +99,3 @@ along with GNU Emacs. If not, see . */ /* This definition was suggested for next release. So give it a try. */ #define HAVE_SOCKETS -