aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2011-02-15 16:33:44 -0800
committerPaul Eggert2011-02-15 16:33:44 -0800
commit1f5d53eb532df40b6c41d25a8b1eaf4ccf69d518 (patch)
tree344ee816d4cbc354fb53a4d4a31bfad28f2e1bff /src
parent7127b760aed65cd08fbba67b8ad14f1840532b45 (diff)
downloademacs-1f5d53eb532df40b6c41d25a8b1eaf4ccf69d518.tar.gz
emacs-1f5d53eb532df40b6c41d25a8b1eaf4ccf69d518.zip
Import getloadavg module from gnulib.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog28
-rw-r--r--src/config.in23
-rw-r--r--src/deps.mk1
-rw-r--r--src/getloadavg.c1037
-rw-r--r--src/lisp.h5
-rw-r--r--src/m/alpha.h7
-rw-r--r--src/m/amdx86-64.h7
-rw-r--r--src/m/ia64.h7
-rw-r--r--src/m/ibms390.h7
-rw-r--r--src/m/macppc.h7
-rw-r--r--src/m/sparc.h7
-rw-r--r--src/m/template.h7
-rw-r--r--src/m/vax.h10
-rw-r--r--src/s/aix4-2.h7
-rw-r--r--src/s/bsd-common.h11
-rw-r--r--src/s/freebsd.h2
-rw-r--r--src/s/hpux10-20.h21
-rw-r--r--src/s/netbsd.h3
-rw-r--r--src/s/unixware.h10
-rw-r--r--src/s/usg5-4-common.h7
20 files changed, 36 insertions, 1178 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index c9ae55a30c1..aae583094f2 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,29 @@
12011-02-16 Paul Eggert <eggert@cs.ucla.edu>
2
3 Remove no-longer needed getloadavg symbols.
4 * m/alpha.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove.
5 * m/amdx86-64.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove.
6 * m/ia64.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove.
7 * m/ibms390.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove.
8 * m/macppc.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove.
9 * m/sparc.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove.
10 * m/template.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove.
11 * m/vax.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Remove.
12 * s/aix4-2.h (KERNEL_FILE, LDAV_SYMBOL): Remove.
13 * s/bsd-common.h (KERNEL_FILE, LDAV_SYMBOL): Remove #undef.
14 * s/hpux10-20.h (KERNEL_FILE, LOAD_AVE_TYPE, LOAD_AVE_CVT):
15 (LDAV_SYMBOL): Remove.
16 * s/unixware.h (LOAD_AVE_TYPE, LOAD_AVE_CVT, FSCALE): Remove.
17 * s/usg5-4-common.h (KERNEL_FILE, LDAV_SYMBOL): Remove.
18
19 Import getloadavg module from gnulib.
20 * deps.mk (getloadavg.o): Remove; gnulib now does this.
21 * lisp.h (getloadavg) [!defined HAVE_GETLOADAVG]: Remove; gnulib
22 now does this.
23 * src/s/freebsd.h (HAVE_GETLOADAVG): Remove; gnulib now does this.
24 * src/s/netbsd.h (HAVE_GETLOADAVG): Likewise.
25 * config.in: Regenerate.
26
12011-02-15 Eli Zaretskii <eliz@gnu.org> 272011-02-15 Eli Zaretskii <eliz@gnu.org>
2 28
3 * nsfns.m (ns_set_name_as_filename, Fns_read_file_name): Use B_. 29 * nsfns.m (ns_set_name_as_filename, Fns_read_file_name): Use B_.
@@ -9,7 +35,7 @@
9 35
102011-02-14 Eli Zaretskii <eliz@gnu.org> 362011-02-14 Eli Zaretskii <eliz@gnu.org>
11 37
12 * msdos.c (IT_frame_up_to_date): 38 * msdos.c (IT_frame_up_to_date):
13 * s/msdos.h (MODE_LINE_BINARY_TEXT): Use B_ for the MS-DOS build. 39 * s/msdos.h (MODE_LINE_BINARY_TEXT): Use B_ for the MS-DOS build.
14 40
15 * dired.c (directory_files_internal): 41 * dired.c (directory_files_internal):
diff --git a/src/config.in b/src/config.in
index 729c598a445..637287a024c 100644
--- a/src/config.in
+++ b/src/config.in
@@ -42,9 +42,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
42/* Define to 1 if using `alloca.c'. */ 42/* Define to 1 if using `alloca.c'. */
43#undef C_ALLOCA 43#undef C_ALLOCA
44 44
45/* Define to 1 if using `getloadavg.c'. */
46#undef C_GETLOADAVG
47
48/* Define to 1 for DGUX with <sys/dg_sys_info.h>. */ 45/* Define to 1 for DGUX with <sys/dg_sys_info.h>. */
49#undef DGUX 46#undef DGUX
50 47
@@ -74,10 +71,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
74/* Define this to check for short string overrun. */ 71/* Define this to check for short string overrun. */
75#undef GC_CHECK_STRING_OVERRUN 72#undef GC_CHECK_STRING_OVERRUN
76 73
77/* Define to 1 if the `getloadavg' function needs to be run setuid or setgid.
78 */
79#undef GETLOADAVG_PRIVILEGED
80
81/* Define to 1 if the `getpgrp' function requires zero arguments. */ 74/* Define to 1 if the `getpgrp' function requires zero arguments. */
82#undef GETPGRP_VOID 75#undef GETPGRP_VOID
83 76
@@ -225,9 +218,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
225/* Define to 1 if you have the `getline' function. */ 218/* Define to 1 if you have the `getline' function. */
226#undef HAVE_GETLINE 219#undef HAVE_GETLINE
227 220
228/* Define to 1 if you have the `getloadavg' function. */
229#undef HAVE_GETLOADAVG
230
231/* Define to 1 if you have the <getopt.h> header file. */ 221/* Define to 1 if you have the <getopt.h> header file. */
232#undef HAVE_GETOPT_H 222#undef HAVE_GETOPT_H
233 223
@@ -408,6 +398,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
408/* Define to 1 if using libotf. */ 398/* Define to 1 if using libotf. */
409#undef HAVE_LIBOTF 399#undef HAVE_LIBOTF
410 400
401/* Define to 1 if you have the `perfstat' library (-lperfstat). */
402#undef HAVE_LIBPERFSTAT
403
411/* Define to 1 if you have the <libpng/png.h> header file. */ 404/* Define to 1 if you have the <libpng/png.h> header file. */
412#undef HAVE_LIBPNG_PNG_H 405#undef HAVE_LIBPNG_PNG_H
413 406
@@ -672,6 +665,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
672/* Define to 1 if you have the `sysinfo' function. */ 665/* Define to 1 if you have the `sysinfo' function. */
673#undef HAVE_SYSINFO 666#undef HAVE_SYSINFO
674 667
668/* Define to 1 if you have the <sys/loadavg.h> header file. */
669#undef HAVE_SYS_LOADAVG_H
670
675/* Define to 1 if you have the <sys/mman.h> header file. */ 671/* Define to 1 if you have the <sys/mman.h> header file. */
676#undef HAVE_SYS_MMAN_H 672#undef HAVE_SYS_MMAN_H
677 673
@@ -870,10 +866,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
870/* Define to support POP mail retrieval. */ 866/* Define to support POP mail retrieval. */
871#undef MAIL_USE_POP 867#undef MAIL_USE_POP
872 868
873/* Define to 1 if your `struct nlist' has an `n_un' member. Obsolete, depend
874 on `HAVE_STRUCT_NLIST_N_UN_N_NAME */
875#undef NLIST_NAME_UNION
876
877/* Define to 1 if you don't have struct exception in math.h. */ 869/* Define to 1 if you don't have struct exception in math.h. */
878#undef NO_MATHERR 870#undef NO_MATHERR
879 871
@@ -889,6 +881,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
889/* Define to 1 if you are using NS windowing under GNUstep. */ 881/* Define to 1 if you are using NS windowing under GNUstep. */
890#undef NS_IMPL_GNUSTEP 882#undef NS_IMPL_GNUSTEP
891 883
884/* Define to 1 if the nlist n_name member is a pointer */
885#undef N_NAME_POINTER
886
892/* Define if the C compiler is the linker. */ 887/* Define if the C compiler is the linker. */
893#undef ORDINARY_LINK 888#undef ORDINARY_LINK
894 889
diff --git a/src/deps.mk b/src/deps.mk
index e8ff3dd592e..3cb69bab2d8 100644
--- a/src/deps.mk
+++ b/src/deps.mk
@@ -115,7 +115,6 @@ fringe.o: fringe.c dispextern.h nsgui.h frame.h window.h buffer.h termhooks.h \
115ftfont.o: ftfont.c dispextern.h frame.h character.h charset.h composite.h \ 115ftfont.o: ftfont.c dispextern.h frame.h character.h charset.h composite.h \
116 font.h lisp.h $(config_h) blockinput.h atimer.h systime.h coding.h \ 116 font.h lisp.h $(config_h) blockinput.h atimer.h systime.h coding.h \
117 fontset.h ccl.h ftfont.h globals.h 117 fontset.h ccl.h ftfont.h globals.h
118getloadavg.o: getloadavg.c $(config_h)
119gnutls.o: gnutls.c gnutls.h process.h ../lib/unistd.h \ 118gnutls.o: gnutls.c gnutls.h process.h ../lib/unistd.h \
120 lisp.h globals.h $(config_h) 119 lisp.h globals.h $(config_h)
121gtkutil.o: gtkutil.c gtkutil.h xterm.h lisp.h frame.h lisp.h $(config_h) \ 120gtkutil.o: gtkutil.c gtkutil.h xterm.h lisp.h frame.h lisp.h $(config_h) \
diff --git a/src/getloadavg.c b/src/getloadavg.c
deleted file mode 100644
index d9c24717b79..00000000000
--- a/src/getloadavg.c
+++ /dev/null
@@ -1,1037 +0,0 @@
1/* Get the system load averages.
2 Copyright (C) 1985, 1986, 1987, 1988, 1989, 1991, 1992, 1993, 1994, 1995,
3 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
4 Free Software Foundation, Inc.
5
6 NOTE: The canonical source of this file is maintained with gnulib.
7 Bugs can be reported to bug-gnulib@gnu.org.
8
9 This program is free software; you can redistribute it and/or modify
10 it under the terms of the GNU General Public License as published by
11 the Free Software Foundation; either version 2, or (at your option)
12 any later version.
13
14 This program is distributed in the hope that it will be useful,
15 but WITHOUT ANY WARRANTY; without even the implied warranty of
16 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17 GNU General Public License for more details.
18
19 You should have received a copy of the GNU General Public License
20 along with this program; if not, write to the Free Software
21 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
22 USA. */
23
24/* Compile-time symbols that this file uses:
25
26 HAVE_PSTAT_GETDYNAMIC Define this if your system has the
27 pstat_getdynamic function. I think it
28 is unique to HPUX9. The best way to get the
29 definition is through the AC_FUNC_GETLOADAVG
30 macro that comes with autoconf 2.13 or newer.
31 If that isn't an option, then just put
32 AC_CHECK_FUNCS(pstat_getdynamic) in your
33 configure.in file.
34 FIXUP_KERNEL_SYMBOL_ADDR() Adjust address in returned struct nlist.
35 KERNEL_FILE Pathname of the kernel to nlist.
36 LDAV_CVT() Scale the load average from the kernel.
37 Returns a double.
38 LDAV_SYMBOL Name of kernel symbol giving load average.
39 LOAD_AVE_TYPE Type of the load average array in the kernel.
40 Must be defined unless one of
41 apollo, DGUX, NeXT, or UMAX is defined;
42 or we have libkstat;
43 otherwise, no load average is available.
44 HAVE_NLIST_H nlist.h is available. NLIST_STRUCT defaults
45 to this.
46 NLIST_STRUCT Include nlist.h, not a.out.h, and
47 the nlist n_name element is a pointer,
48 not an array.
49 HAVE_STRUCT_NLIST_N_UN_N_NAME `n_un.n_name' is member of `struct nlist'.
50 LINUX_LDAV_FILE [__linux__]: File containing load averages.
51 HAVE_LOCALE_H locale.h is available.
52 HAVE_SETLOCALE The `setlocale' function is available.
53
54 Specific system predefines this file uses, aside from setting
55 default values if not emacs:
56
57 apollo
58 BSD Real BSD, not just BSD-like.
59 convex
60 DGUX
61 eunice UNIX emulator under VMS.
62 hpux
63 __MSDOS__ No-op for MSDOS.
64 NeXT
65 sgi
66 sequent Sequent Dynix 3.x.x (BSD)
67 _SEQUENT_ Sequent DYNIX/ptx 1.x.x (SYSV)
68 sony_news NEWS-OS (works at least for 4.1C)
69 UMAX
70 UMAX4_3
71 VMS
72 WINDOWS32 No-op for Windows95/NT.
73 __linux__ Linux: assumes /proc filesystem mounted.
74 Support from Michael K. Johnson.
75 __NetBSD__ NetBSD: assumes /kern filesystem mounted.
76
77 In addition, to avoid nesting many #ifdefs, we internally set
78 LDAV_DONE to indicate that the load average has been computed.
79
80 We also #define LDAV_PRIVILEGED if a program will require
81 special installation to be able to call getloadavg. */
82
83/* This should always be first. */
84#ifdef HAVE_CONFIG_H
85# include <config.h>
86#endif
87
88#include <sys/types.h>
89
90/* Both the Emacs and non-Emacs sections want this. Some
91 configuration files' definitions for the LOAD_AVE_CVT macro (like
92 sparc.h's) use macros like FSCALE, defined here. */
93#if defined (unix) || defined (__unix)
94# include <sys/param.h>
95#endif
96
97
98/* Exclude all the code except the test program at the end
99 if the system has its own `getloadavg' function.
100
101 The declaration of `errno' is needed by the test program
102 as well as the function itself, so it comes first. */
103
104#include <errno.h>
105
106#ifndef errno
107extern int errno;
108#endif
109
110#ifdef HAVE_LOCALE_H
111# include <locale.h>
112#endif
113#ifndef HAVE_SETLOCALE
114# define setlocale(Category, Locale) /* empty */
115#endif
116
117#ifndef HAVE_GETLOADAVG
118
119/* The existing Emacs configuration files define a macro called
120 LOAD_AVE_CVT, which accepts a value of type LOAD_AVE_TYPE, and
121 returns the load average multiplied by 100. What we actually want
122 is a macro called LDAV_CVT, which returns the load average as an
123 unmultiplied double.
124
125 For backwards compatibility, we'll define LDAV_CVT in terms of
126 LOAD_AVE_CVT, but future machine config files should just define
127 LDAV_CVT directly. */
128
129# if !defined(LDAV_CVT) && defined(LOAD_AVE_CVT)
130# define LDAV_CVT(n) (LOAD_AVE_CVT (n) / 100.0)
131# endif
132
133# if !defined (BSD) && defined (ultrix)
134/* Ultrix behaves like BSD on Vaxen. */
135# define BSD
136# endif
137
138# ifdef NeXT
139/* NeXT in the 2.{0,1,2} releases defines BSD in <sys/param.h>, which
140 conflicts with the definition understood in this file, that this
141 really is BSD. */
142# undef BSD
143
144/* NeXT defines FSCALE in <sys/param.h>. However, we take FSCALE being
145 defined to mean that the nlist method should be used, which is not true. */
146# undef FSCALE
147# endif
148
149/* Same issues as for NeXT apply to the HURD-based GNU system. */
150# ifdef __GNU__
151# undef BSD
152# undef FSCALE
153# endif /* __GNU__ */
154
155/* Set values that are different from the defaults, which are
156 set a little farther down with #ifndef. */
157
158
159/* Some shorthands. */
160
161# if defined (HPUX) && !defined (hpux)
162# define hpux
163# endif
164
165# if defined (__hpux) && !defined (hpux)
166# define hpux
167# endif
168
169# if defined (__sun) && !defined (sun)
170# define sun
171# endif
172
173# if defined(hp300) && !defined(hpux)
174# define MORE_BSD
175# endif
176
177# if defined(ultrix) && defined(mips)
178# define decstation
179# endif
180
181# if defined (__SVR4) && !defined (SVR4)
182# define SVR4
183# endif
184
185# if (defined(sun) && defined(SVR4)) || defined (SOLARIS2)
186# define SUNOS_5
187# endif
188
189# if defined (__osf__) && (defined (__alpha) || defined (__alpha__))
190# define OSF_ALPHA
191# include <sys/mbuf.h>
192# include <sys/socket.h>
193# include <net/route.h>
194# include <sys/table.h>
195# endif
196
197# if defined (__osf__) && (defined (mips) || defined (__mips__))
198# define OSF_MIPS
199# include <sys/table.h>
200# endif
201
202/* UTek's /bin/cc on the 4300 has no architecture specific cpp define by
203 default, but _MACH_IND_SYS_TYPES is defined in <sys/types.h>. Combine
204 that with a couple of other things and we'll have a unique match. */
205# if !defined (tek4300) && defined (unix) && defined (m68k) && defined (mc68000) && defined (mc68020) && defined (_MACH_IND_SYS_TYPES)
206# define tek4300 /* Define by emacs, but not by other users. */
207# endif
208
209
210/* VAX C can't handle multi-line #ifs, or lines longer than 256 chars. */
211# ifndef LOAD_AVE_TYPE
212
213# ifdef MORE_BSD
214# define LOAD_AVE_TYPE long
215# endif
216
217# ifdef sun
218# define LOAD_AVE_TYPE long
219# endif
220
221# ifdef decstation
222# define LOAD_AVE_TYPE long
223# endif
224
225# ifdef _SEQUENT_
226# define LOAD_AVE_TYPE long
227# endif
228
229# ifdef sgi
230# define LOAD_AVE_TYPE long
231# endif
232
233# ifdef SVR4
234# define LOAD_AVE_TYPE long
235# endif
236
237# ifdef sony_news
238# define LOAD_AVE_TYPE long
239# endif
240
241# ifdef sequent
242# define LOAD_AVE_TYPE long
243# endif
244
245# ifdef OSF_ALPHA
246# define LOAD_AVE_TYPE long
247# endif
248
249# if defined (ardent) && defined (titan)
250# define LOAD_AVE_TYPE long
251# endif
252
253# ifdef tek4300
254# define LOAD_AVE_TYPE long
255# endif
256
257# if defined(alliant) && defined(i860) /* Alliant FX/2800 */
258# define LOAD_AVE_TYPE long
259# endif
260
261# ifdef _AIX
262# define LOAD_AVE_TYPE long
263# endif
264
265# ifdef convex
266# define LOAD_AVE_TYPE double
267# ifndef LDAV_CVT
268# define LDAV_CVT(n) (n)
269# endif
270# endif
271
272# endif /* No LOAD_AVE_TYPE. */
273
274# ifdef OSF_ALPHA
275/* <sys/param.h> defines an incorrect value for FSCALE on Alpha OSF/1,
276 according to ghazi@noc.rutgers.edu. */
277# undef FSCALE
278# define FSCALE 1024.0
279# endif
280
281# if defined(alliant) && defined(i860) /* Alliant FX/2800 */
282/* <sys/param.h> defines an incorrect value for FSCALE on an
283 Alliant FX/2800 Concentrix 2.2, according to ghazi@noc.rutgers.edu. */
284# undef FSCALE
285# define FSCALE 100.0
286# endif
287
288
289# ifndef FSCALE
290
291/* SunOS and some others define FSCALE in sys/param.h. */
292
293# ifdef MORE_BSD
294# define FSCALE 2048.0
295# endif
296
297# if defined(MIPS) || defined(SVR4) || defined(decstation)
298# define FSCALE 256
299# endif
300
301# if defined (sgi) || defined (sequent)
302/* Sometimes both MIPS and sgi are defined, so FSCALE was just defined
303 above under #ifdef MIPS. But we want the sgi value. */
304# undef FSCALE
305# define FSCALE 1000.0
306# endif
307
308# if defined (ardent) && defined (titan)
309# define FSCALE 65536.0
310# endif
311
312# ifdef tek4300
313# define FSCALE 100.0
314# endif
315
316# ifdef _AIX
317# define FSCALE 65536.0
318# endif
319
320# endif /* Not FSCALE. */
321
322# if !defined (LDAV_CVT) && defined (FSCALE)
323# define LDAV_CVT(n) (((double) (n)) / FSCALE)
324# endif
325
326# ifndef NLIST_STRUCT
327# if HAVE_NLIST_H
328# define NLIST_STRUCT
329# endif
330# endif
331
332# if defined(sgi) || (defined(mips) && !defined(BSD))
333# define FIXUP_KERNEL_SYMBOL_ADDR(nl) ((nl)[0].n_value &= ~(1 << 31))
334# endif
335
336
337# if !defined (KERNEL_FILE) && defined (sequent)
338# define KERNEL_FILE "/dynix"
339# endif
340
341# if !defined (KERNEL_FILE) && defined (hpux)
342# define KERNEL_FILE "/hp-ux"
343# endif
344
345# if !defined(KERNEL_FILE) && (defined(_SEQUENT_) || defined(MIPS) || defined(SVR4) || defined(ISC) || defined (sgi) || (defined (ardent) && defined (titan)))
346# define KERNEL_FILE "/unix"
347# endif
348
349
350# if !defined (LDAV_SYMBOL) && defined (alliant)
351# define LDAV_SYMBOL "_Loadavg"
352# endif
353
354# if !defined(LDAV_SYMBOL) && ((defined(hpux) && !defined(hp9000s300)) || defined(_SEQUENT_) || defined(SVR4) || defined(ISC) || defined(sgi) || (defined (ardent) && defined (titan)) || defined (_AIX))
355# define LDAV_SYMBOL "avenrun"
356# endif
357
358# include <unistd.h>
359# include <stdio.h>
360
361/* LOAD_AVE_TYPE should only get defined if we're going to use the
362 nlist method. */
363# if !defined(LOAD_AVE_TYPE) && (defined(BSD) || defined(LDAV_CVT) || defined(KERNEL_FILE) || defined(LDAV_SYMBOL))
364# define LOAD_AVE_TYPE double
365# endif
366
367# ifdef LOAD_AVE_TYPE
368
369# ifndef VMS
370# ifndef __linux__
371# ifndef NLIST_STRUCT
372# include <a.out.h>
373# else /* NLIST_STRUCT */
374# include <nlist.h>
375# endif /* NLIST_STRUCT */
376
377# ifdef SUNOS_5
378# include <fcntl.h>
379# include <kvm.h>
380# include <kstat.h>
381# endif
382
383# if defined (hpux) && defined (HAVE_PSTAT_GETDYNAMIC)
384# include <sys/pstat.h>
385# endif
386
387# ifndef KERNEL_FILE
388# define KERNEL_FILE "/vmunix"
389# endif /* KERNEL_FILE */
390
391# ifndef LDAV_SYMBOL
392# define LDAV_SYMBOL "_avenrun"
393# endif /* LDAV_SYMBOL */
394# endif /* __linux__ */
395
396# else /* VMS */
397
398# ifndef eunice
399# include <iodef.h>
400# include <descrip.h>
401# else /* eunice */
402# include <vms/iodef.h>
403# endif /* eunice */
404# endif /* VMS */
405
406# ifndef LDAV_CVT
407# define LDAV_CVT(n) ((double) (n))
408# endif /* !LDAV_CVT */
409
410# endif /* LOAD_AVE_TYPE */
411
412# if defined(__GNU__) && !defined (NeXT)
413/* Note that NeXT Openstep defines __GNU__ even though it should not. */
414/* GNU system acts much like NeXT, for load average purposes,
415 but not exactly. */
416# define NeXT
417# define host_self mach_host_self
418# endif
419
420# ifdef NeXT
421# ifdef HAVE_MACH_MACH_H
422# include <mach/mach.h>
423# else
424# include <mach.h>
425# endif
426# endif /* NeXT */
427
428# ifdef sgi
429# include <sys/sysmp.h>
430# endif /* sgi */
431
432# ifdef UMAX
433# include <stdio.h>
434# include <signal.h>
435# include <sys/time.h>
436# include <sys/wait.h>
437# include <sys/syscall.h>
438
439# ifdef UMAX_43
440# include <machine/cpu.h>
441# include <inq_stats/statistics.h>
442# include <inq_stats/sysstats.h>
443# include <inq_stats/cpustats.h>
444# include <inq_stats/procstats.h>
445# else /* Not UMAX_43. */
446# include <sys/sysdefs.h>
447# include <sys/statistics.h>
448# include <sys/sysstats.h>
449# include <sys/cpudefs.h>
450# include <sys/cpustats.h>
451# include <sys/procstats.h>
452# endif /* Not UMAX_43. */
453# endif /* UMAX */
454
455# ifdef DGUX
456# include <sys/dg_sys_info.h>
457# endif
458
459# if defined(HAVE_FCNTL_H) || defined(_POSIX_VERSION)
460# include <fcntl.h>
461# else
462# include <sys/file.h>
463# endif
464
465/* Avoid static vars inside a function since in HPUX they dump as pure. */
466
467# ifdef NeXT
468static processor_set_t default_set;
469static int getloadavg_initialized;
470# endif /* NeXT */
471
472# ifdef UMAX
473static unsigned int cpus = 0;
474static unsigned int samples;
475# endif /* UMAX */
476
477# ifdef DGUX
478static struct dg_sys_info_load_info load_info; /* what-a-mouthful! */
479# endif /* DGUX */
480
481#if !defined(HAVE_LIBKSTAT) && defined(LOAD_AVE_TYPE)
482/* File descriptor open to /dev/kmem or VMS load ave driver. */
483static int channel;
484/* Nonzero if channel is valid. */
485static int getloadavg_initialized;
486/* Offset in kmem to seek to read load average, or 0 means invalid. */
487static long offset;
488
489# if !defined(VMS) && !defined(sgi) && !defined(__linux__)
490static struct nlist name_list[2];
491# endif /* Not VMS or sgi */
492
493# ifdef SUNOS_5
494static kvm_t *kd;
495# endif /* SUNOS_5 */
496
497#endif /* LOAD_AVE_TYPE && !HAVE_LIBKSTAT */
498
499/* Put the 1 minute, 5 minute and 15 minute load averages
500 into the first NELEM elements of LOADAVG.
501 Return the number written (never more than 3, but may be less than NELEM),
502 or -1 if an error occurred. */
503
504int
505getloadavg (loadavg, nelem)
506 double loadavg[];
507 int nelem;
508{
509 int elem = 0; /* Return value. */
510
511# ifdef NO_GET_LOAD_AVG
512# define LDAV_DONE
513 /* Set errno to zero to indicate that there was no particular error;
514 this function just can't work at all on this system. */
515 errno = 0;
516 elem = -1;
517# endif
518
519# if !defined (LDAV_DONE) && defined (HAVE_LIBKSTAT)
520/* Use libkstat because we don't have to be root. */
521# define LDAV_DONE
522 kstat_ctl_t *kc;
523 kstat_t *ksp;
524 kstat_named_t *kn;
525
526 kc = kstat_open ();
527 if (kc == 0)
528 return -1;
529 ksp = kstat_lookup (kc, "unix", 0, "system_misc");
530 if (ksp == 0 )
531 return -1;
532 if (kstat_read (kc, ksp, 0) == -1)
533 return -1;
534
535
536 kn = kstat_data_lookup (ksp, "avenrun_1min");
537 if (kn == 0)
538 {
539 /* Return -1 if no load average information is available. */
540 nelem = 0;
541 elem = -1;
542 }
543
544 if (nelem >= 1)
545 loadavg[elem++] = (double) kn->value.ul/FSCALE;
546
547 if (nelem >= 2)
548 {
549 kn = kstat_data_lookup (ksp, "avenrun_5min");
550 if (kn != 0)
551 {
552 loadavg[elem++] = (double) kn->value.ul/FSCALE;
553
554 if (nelem >= 3)
555 {
556 kn = kstat_data_lookup (ksp, "avenrun_15min");
557 if (kn != 0)
558 loadavg[elem++] = (double) kn->value.ul/FSCALE;
559 }
560 }
561 }
562
563 kstat_close (kc);
564# endif /* HAVE_LIBKSTAT */
565
566# if !defined (LDAV_DONE) && defined (hpux) && defined (HAVE_PSTAT_GETDYNAMIC)
567/* Use pstat_getdynamic() because we don't have to be root. */
568# define LDAV_DONE
569# undef LOAD_AVE_TYPE
570
571 struct pst_dynamic dyn_info;
572 if (pstat_getdynamic (&dyn_info, sizeof (dyn_info), 0, 0) < 0)
573 return -1;
574 if (nelem > 0)
575 loadavg[elem++] = dyn_info.psd_avg_1_min;
576 if (nelem > 1)
577 loadavg[elem++] = dyn_info.psd_avg_5_min;
578 if (nelem > 2)
579 loadavg[elem++] = dyn_info.psd_avg_15_min;
580
581# endif /* hpux && HAVE_PSTAT_GETDYNAMIC */
582
583# if !defined (LDAV_DONE) && defined (__linux__)
584# define LDAV_DONE
585# undef LOAD_AVE_TYPE
586
587# ifndef LINUX_LDAV_FILE
588# define LINUX_LDAV_FILE "/proc/loadavg"
589# endif
590
591 char ldavgbuf[40];
592 double load_ave[3];
593 int fd, count;
594
595 fd = open (LINUX_LDAV_FILE, O_RDONLY);
596 if (fd == -1)
597 return -1;
598 count = read (fd, ldavgbuf, 40);
599 (void) close (fd);
600 if (count <= 0)
601 return -1;
602
603 /* The following sscanf must use the C locale. */
604 setlocale (LC_NUMERIC, "C");
605 count = sscanf (ldavgbuf, "%lf %lf %lf",
606 &load_ave[0], &load_ave[1], &load_ave[2]);
607 setlocale (LC_NUMERIC, "");
608 if (count < 1)
609 return -1;
610
611 for (elem = 0; elem < nelem && elem < count; elem++)
612 loadavg[elem] = load_ave[elem];
613
614 return elem;
615
616# endif /* __linux__ */
617
618# if !defined (LDAV_DONE) && defined (__NetBSD__)
619# define LDAV_DONE
620# undef LOAD_AVE_TYPE
621
622# ifndef NETBSD_LDAV_FILE
623# define NETBSD_LDAV_FILE "/kern/loadavg"
624# endif
625
626 unsigned long int load_ave[3], scale;
627 int count;
628 FILE *fp;
629
630 fp = fopen (NETBSD_LDAV_FILE, "r");
631 if (fp == NULL)
632 return -1;
633 count = fscanf (fp, "%lu %lu %lu %lu\n",
634 &load_ave[0], &load_ave[1], &load_ave[2],
635 &scale);
636 (void) fclose (fp);
637 if (count != 4)
638 return -1;
639
640 for (elem = 0; elem < nelem; elem++)
641 loadavg[elem] = (double) load_ave[elem] / (double) scale;
642
643 return elem;
644
645# endif /* __NetBSD__ */
646
647# if !defined (LDAV_DONE) && defined (NeXT)
648# define LDAV_DONE
649 /* The NeXT code was adapted from iscreen 3.2. */
650
651 host_t host;
652 struct processor_set_basic_info info;
653 unsigned info_count;
654
655 /* We only know how to get the 1-minute average for this system,
656 so even if the caller asks for more than 1, we only return 1. */
657
658 if (!getloadavg_initialized)
659 {
660 if (processor_set_default (host_self (), &default_set) == KERN_SUCCESS)
661 getloadavg_initialized = 1;
662 }
663
664 if (getloadavg_initialized)
665 {
666 info_count = PROCESSOR_SET_BASIC_INFO_COUNT;
667 if (processor_set_info (default_set, PROCESSOR_SET_BASIC_INFO, &host,
668 (processor_set_info_t) &info, &info_count)
669 != KERN_SUCCESS)
670 getloadavg_initialized = 0;
671 else
672 {
673 if (nelem > 0)
674 loadavg[elem++] = (double) info.load_average / LOAD_SCALE;
675 }
676 }
677
678 if (!getloadavg_initialized)
679 return -1;
680# endif /* NeXT */
681
682# if !defined (LDAV_DONE) && defined (UMAX)
683# define LDAV_DONE
684/* UMAX 4.2, which runs on the Encore Multimax multiprocessor, does not
685 have a /dev/kmem. Information about the workings of the running kernel
686 can be gathered with inq_stats system calls.
687 We only know how to get the 1-minute average for this system. */
688
689 struct proc_summary proc_sum_data;
690 struct stat_descr proc_info;
691 double load;
692 register unsigned int i, j;
693
694 if (cpus == 0)
695 {
696 register unsigned int c, i;
697 struct cpu_config conf;
698 struct stat_descr desc;
699
700 desc.sd_next = 0;
701 desc.sd_subsys = SUBSYS_CPU;
702 desc.sd_type = CPUTYPE_CONFIG;
703 desc.sd_addr = (char *) &conf;
704 desc.sd_size = sizeof conf;
705
706 if (inq_stats (1, &desc))
707 return -1;
708
709 c = 0;
710 for (i = 0; i < conf.config_maxclass; ++i)
711 {
712 struct class_stats stats;
713 memset (&stats, 0, sizeof stats);
714
715 desc.sd_type = CPUTYPE_CLASS;
716 desc.sd_objid = i;
717 desc.sd_addr = (char *) &stats;
718 desc.sd_size = sizeof stats;
719
720 if (inq_stats (1, &desc))
721 return -1;
722
723 c += stats.class_numcpus;
724 }
725 cpus = c;
726 samples = cpus < 2 ? 3 : (2 * cpus / 3);
727 }
728
729 proc_info.sd_next = 0;
730 proc_info.sd_subsys = SUBSYS_PROC;
731 proc_info.sd_type = PROCTYPE_SUMMARY;
732 proc_info.sd_addr = (char *) &proc_sum_data;
733 proc_info.sd_size = sizeof (struct proc_summary);
734 proc_info.sd_sizeused = 0;
735
736 if (inq_stats (1, &proc_info) != 0)
737 return -1;
738
739 load = proc_sum_data.ps_nrunnable;
740 j = 0;
741 for (i = samples - 1; i > 0; --i)
742 {
743 load += proc_sum_data.ps_nrun[j];
744 if (j++ == PS_NRUNSIZE)
745 j = 0;
746 }
747
748 if (nelem > 0)
749 loadavg[elem++] = load / samples / cpus;
750# endif /* UMAX */
751
752# if !defined (LDAV_DONE) && defined (DGUX)
753# define LDAV_DONE
754 /* This call can return -1 for an error, but with good args
755 it's not supposed to fail. The first argument is for no
756 apparent reason of type `long int *'. */
757 dg_sys_info ((long int *) &load_info,
758 DG_SYS_INFO_LOAD_INFO_TYPE,
759 DG_SYS_INFO_LOAD_VERSION_0);
760
761 if (nelem > 0)
762 loadavg[elem++] = load_info.one_minute;
763 if (nelem > 1)
764 loadavg[elem++] = load_info.five_minute;
765 if (nelem > 2)
766 loadavg[elem++] = load_info.fifteen_minute;
767# endif /* DGUX */
768
769# if !defined (LDAV_DONE) && defined (apollo)
770# define LDAV_DONE
771/* Apollo code from lisch@mentorg.com (Ray Lischner).
772
773 This system call is not documented. The load average is obtained as
774 three long integers, for the load average over the past minute,
775 five minutes, and fifteen minutes. Each value is a scaled integer,
776 with 16 bits of integer part and 16 bits of fraction part.
777
778 I'm not sure which operating system first supported this system call,
779 but I know that SR10.2 supports it. */
780
781 extern void proc1_$get_loadav ();
782 unsigned long load_ave[3];
783
784 proc1_$get_loadav (load_ave);
785
786 if (nelem > 0)
787 loadavg[elem++] = load_ave[0] / 65536.0;
788 if (nelem > 1)
789 loadavg[elem++] = load_ave[1] / 65536.0;
790 if (nelem > 2)
791 loadavg[elem++] = load_ave[2] / 65536.0;
792# endif /* apollo */
793
794# if !defined (LDAV_DONE) && defined (OSF_MIPS)
795# define LDAV_DONE
796
797 struct tbl_loadavg load_ave;
798 table (TBL_LOADAVG, 0, &load_ave, 1, sizeof (load_ave));
799 loadavg[elem++]
800 = (load_ave.tl_lscale == 0
801 ? load_ave.tl_avenrun.d[0]
802 : (load_ave.tl_avenrun.l[0] / (double) load_ave.tl_lscale));
803# endif /* OSF_MIPS */
804
805# if !defined (LDAV_DONE) && (defined (__MSDOS__) || defined (WINDOWS32))
806# define LDAV_DONE
807
808 /* A faithful emulation is going to have to be saved for a rainy day. */
809 for ( ; elem < nelem; elem++)
810 {
811 loadavg[elem] = 0.0;
812 }
813# endif /* __MSDOS__ || WINDOWS32 */
814
815# if !defined (LDAV_DONE) && defined (OSF_ALPHA)
816# define LDAV_DONE
817
818 struct tbl_loadavg load_ave;
819 table (TBL_LOADAVG, 0, &load_ave, 1, sizeof (load_ave));
820 for (elem = 0; elem < nelem; elem++)
821 loadavg[elem]
822 = (load_ave.tl_lscale == 0
823 ? load_ave.tl_avenrun.d[elem]
824 : (load_ave.tl_avenrun.l[elem] / (double) load_ave.tl_lscale));
825# endif /* OSF_ALPHA */
826
827# if !defined (LDAV_DONE) && defined (VMS)
828 /* VMS specific code -- read from the Load Ave driver. */
829
830 LOAD_AVE_TYPE load_ave[3];
831 static int getloadavg_initialized = 0;
832# ifdef eunice
833 struct
834 {
835 int dsc$w_length;
836 char *dsc$a_pointer;
837 } descriptor;
838# endif
839
840 /* Ensure that there is a channel open to the load ave device. */
841 if (!getloadavg_initialized)
842 {
843 /* Attempt to open the channel. */
844# ifdef eunice
845 descriptor.dsc$w_length = 18;
846 descriptor.dsc$a_pointer = "$$VMS_LOAD_AVERAGE";
847# else
848 $DESCRIPTOR (descriptor, "LAV0:");
849# endif
850 if (sys$assign (&descriptor, &channel, 0, 0) & 1)
851 getloadavg_initialized = 1;
852 }
853
854 /* Read the load average vector. */
855 if (getloadavg_initialized
856 && !(sys$qiow (0, channel, IO$_READVBLK, 0, 0, 0,
857 load_ave, 12, 0, 0, 0, 0) & 1))
858 {
859 sys$dassgn (channel);
860 getloadavg_initialized = 0;
861 }
862
863 if (!getloadavg_initialized)
864 return -1;
865# endif /* VMS */
866
867# if !defined (LDAV_DONE) && defined(LOAD_AVE_TYPE) && !defined(VMS)
868
869 /* UNIX-specific code -- read the average from /dev/kmem. */
870
871# define LDAV_PRIVILEGED /* This code requires special installation. */
872
873 LOAD_AVE_TYPE load_ave[3];
874
875 /* Get the address of LDAV_SYMBOL. */
876 if (offset == 0)
877 {
878# ifndef sgi
879# ifndef NLIST_STRUCT
880 strcpy (name_list[0].n_name, LDAV_SYMBOL);
881 strcpy (name_list[1].n_name, "");
882# else /* NLIST_STRUCT */
883# ifdef HAVE_STRUCT_NLIST_N_UN_N_NAME
884 name_list[0].n_un.n_name = LDAV_SYMBOL;
885 name_list[1].n_un.n_name = 0;
886# else /* not HAVE_STRUCT_NLIST_N_UN_N_NAME */
887 name_list[0].n_name = LDAV_SYMBOL;
888 name_list[1].n_name = 0;
889# endif /* not HAVE_STRUCT_NLIST_N_UN_N_NAME */
890# endif /* NLIST_STRUCT */
891
892# ifndef SUNOS_5
893 if (
894# if !(defined (_AIX) && !defined (ps2))
895 nlist (KERNEL_FILE, name_list)
896# else /* _AIX */
897 knlist (name_list, 1, sizeof (name_list[0]))
898# endif
899 >= 0)
900 /* Omit "&& name_list[0].n_type != 0 " -- it breaks on Sun386i. */
901 {
902# ifdef FIXUP_KERNEL_SYMBOL_ADDR
903 FIXUP_KERNEL_SYMBOL_ADDR (name_list);
904# endif
905 offset = name_list[0].n_value;
906 }
907# endif /* !SUNOS_5 */
908# else /* sgi */
909 int ldav_off;
910
911 ldav_off = sysmp (MP_KERNADDR, MPKA_AVENRUN);
912 if (ldav_off != -1)
913 offset = (long) ldav_off & 0x7fffffff;
914# endif /* sgi */
915 }
916
917 /* Make sure we have /dev/kmem open. */
918 if (!getloadavg_initialized)
919 {
920# ifndef SUNOS_5
921 channel = open ("/dev/kmem", 0);
922 if (channel >= 0)
923 {
924 /* Set the channel to close on exec, so it does not
925 litter any child's descriptor table. */
926# ifdef F_SETFD
927# ifndef FD_CLOEXEC
928# define FD_CLOEXEC 1
929# endif
930 (void) fcntl (channel, F_SETFD, FD_CLOEXEC);
931# endif
932 getloadavg_initialized = 1;
933 }
934# else /* SUNOS_5 */
935 /* We pass 0 for the kernel, corefile, and swapfile names
936 to use the currently running kernel. */
937 kd = kvm_open (0, 0, 0, O_RDONLY, 0);
938 if (kd != 0)
939 {
940 /* nlist the currently running kernel. */
941 kvm_nlist (kd, name_list);
942 offset = name_list[0].n_value;
943 getloadavg_initialized = 1;
944 }
945# endif /* SUNOS_5 */
946 }
947
948 /* If we can, get the load average values. */
949 if (offset && getloadavg_initialized)
950 {
951 /* Try to read the load. */
952# ifndef SUNOS_5
953 if (lseek (channel, offset, 0) == -1L
954 || read (channel, (char *) load_ave, sizeof (load_ave))
955 != sizeof (load_ave))
956 {
957 close (channel);
958 getloadavg_initialized = 0;
959 }
960# else /* SUNOS_5 */
961 if (kvm_read (kd, offset, (char *) load_ave, sizeof (load_ave))
962 != sizeof (load_ave))
963 {
964 kvm_close (kd);
965 getloadavg_initialized = 0;
966 }
967# endif /* SUNOS_5 */
968 }
969
970 if (offset == 0 || !getloadavg_initialized)
971 return -1;
972# endif /* LOAD_AVE_TYPE and not VMS */
973
974# if !defined (LDAV_DONE) && defined (LOAD_AVE_TYPE) /* Including VMS. */
975 if (nelem > 0)
976 loadavg[elem++] = LDAV_CVT (load_ave[0]);
977 if (nelem > 1)
978 loadavg[elem++] = LDAV_CVT (load_ave[1]);
979 if (nelem > 2)
980 loadavg[elem++] = LDAV_CVT (load_ave[2]);
981
982# define LDAV_DONE
983# endif /* !LDAV_DONE && LOAD_AVE_TYPE */
984
985# ifdef LDAV_DONE
986 return elem;
987# else
988 /* Set errno to zero to indicate that there was no particular error;
989 this function just can't work at all on this system. */
990 errno = 0;
991 return -1;
992# endif
993}
994
995#endif /* ! HAVE_GETLOADAVG */
996
997#ifdef TEST
998void
999main (argc, argv)
1000 int argc;
1001 char **argv;
1002{
1003 int naptime = 0;
1004
1005 if (argc > 1)
1006 naptime = atoi (argv[1]);
1007
1008 while (1)
1009 {
1010 double avg[3];
1011 int loads;
1012
1013 errno = 0; /* Don't be misled if it doesn't set errno. */
1014 loads = getloadavg (avg, 3);
1015 if (loads == -1)
1016 {
1017 perror ("Error getting load average");
1018 exit (1);
1019 }
1020 if (loads > 0)
1021 printf ("1-minute: %f ", avg[0]);
1022 if (loads > 1)
1023 printf ("5-minute: %f ", avg[1]);
1024 if (loads > 2)
1025 printf ("15-minute: %f ", avg[2]);
1026 if (loads > 0)
1027 putchar ('\n');
1028
1029 if (naptime == 0)
1030 break;
1031 sleep (naptime);
1032 }
1033
1034 exit (0);
1035}
1036#endif /* TEST */
1037
diff --git a/src/lisp.h b/src/lisp.h
index 5ab8c71ecfd..0efadd675b0 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -3407,11 +3407,6 @@ EXFUN (Fclear_face_cache, 1);
3407EXFUN (Fx_load_color_file, 1); 3407EXFUN (Fx_load_color_file, 1);
3408extern void syms_of_xfaces (void); 3408extern void syms_of_xfaces (void);
3409 3409
3410#ifndef HAVE_GETLOADAVG
3411/* Defined in getloadavg.c */
3412extern int getloadavg (double *, int);
3413#endif
3414
3415#ifdef HAVE_X_WINDOWS 3410#ifdef HAVE_X_WINDOWS
3416/* Defined in xfns.c */ 3411/* Defined in xfns.c */
3417extern void syms_of_xfns (void); 3412extern void syms_of_xfns (void);
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 <http://www.gnu.org/licenses/>. */
29/* __alpha defined automatically */ 29/* __alpha defined automatically */
30 30
31 31
32/* Data type of load average, as read out of kmem. */
33#define LOAD_AVE_TYPE long
34
35/* Convert that into an integer that is 100 for a load average of 1.0 */
36#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
37
38#ifdef __ELF__ 32#ifdef __ELF__
39 33
40#if !defined(GNU_LINUX) && !defined(__NetBSD__) 34#if !defined(GNU_LINUX) && !defined(__NetBSD__)
@@ -57,4 +51,3 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
57 Define DBL_MIN_REPLACEMENT to be the next value larger than DBL_MIN: 51 Define DBL_MIN_REPLACEMENT to be the next value larger than DBL_MIN:
58 this avoids the assembler bug. */ 52 this avoids the assembler bug. */
59#define DBL_MIN_REPLACEMENT 2.2250738585072019e-308 53#define DBL_MIN_REPLACEMENT 2.2250738585072019e-308
60
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 <http://www.gnu.org/licenses/>. */
30#define EMACS_INT long 30#define EMACS_INT long
31#define EMACS_UINT unsigned long 31#define EMACS_UINT unsigned long
32 32
33/* Data type of load average, as read out of kmem. */
34#define LOAD_AVE_TYPE long
35
36/* Convert that into an integer that is 100 for a load average of 1.0 */
37#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
38
39/* Define XPNTR to avoid or'ing with DATA_SEG_BITS */ 33/* Define XPNTR to avoid or'ing with DATA_SEG_BITS */
40#undef DATA_SEG_BITS 34#undef DATA_SEG_BITS
41
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 <http://www.gnu.org/licenses/>. */
30#define EMACS_INT long 30#define EMACS_INT long
31#define EMACS_UINT unsigned long 31#define EMACS_UINT unsigned long
32 32
33/* Data type of load average, as read out of kmem. */
34#define LOAD_AVE_TYPE long
35
36/* Convert that into an integer that is 100 for a load average of 1.0 */
37#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
38
39#ifdef REL_ALLOC 33#ifdef REL_ALLOC
40#ifndef _MALLOC_INTERNAL 34#ifndef _MALLOC_INTERNAL
41/* "char *" because ralloc.c defines it that way. gmalloc.c thinks it 35/* "char *" because ralloc.c defines it that way. gmalloc.c thinks it
@@ -45,4 +39,3 @@ extern char *r_alloc (), *r_re_alloc ();
45extern void r_alloc_free (); 39extern void r_alloc_free ();
46#endif /* not _MALLOC_INTERNAL */ 40#endif /* not _MALLOC_INTERNAL */
47#endif /* REL_ALLOC */ 41#endif /* REL_ALLOC */
48
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
18along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ 18along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
19 19
20 20
21/* Data type of load average, as read out of kmem. */
22#define LOAD_AVE_TYPE long
23
24/* Convert that into an integer that is 100 for a load average of 1.0 */
25#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
26
27/* Define VIRT_ADDR_VARIES if the virtual addresses of 21/* Define VIRT_ADDR_VARIES if the virtual addresses of
28 pure and impure space as loaded can vary, and even their 22 pure and impure space as loaded can vary, and even their
29 relative order cannot be relied on. 23 relative order cannot be relied on.
@@ -31,4 +25,3 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
31 Otherwise Emacs assumes that text space precedes data space, 25 Otherwise Emacs assumes that text space precedes data space,
32 numerically. */ 26 numerically. */
33#define VIRT_ADDR_VARIES 27#define VIRT_ADDR_VARIES
34
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.
17You should have received a copy of the GNU General Public License 17You should have received a copy of the GNU General Public License
18along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ 18along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
19 19
20/* Data type of load average, as read out of kmem. */
21#define LOAD_AVE_TYPE long
22
23/* Convert that into an integer that is 100 for a load average of 1.0 */
24#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
25
26#ifdef _ARCH_PPC64 20#ifdef _ARCH_PPC64
27#ifndef _LP64 21#ifndef _LP64
28#define _LP64 22#define _LP64
29#endif 23#endif
30#endif 24#endif
31
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 <http://www.gnu.org/licenses/>. */
19 19
20/* __sparc__ is defined by the compiler by default. */ 20/* __sparc__ is defined by the compiler by default. */
21 21
22/* Data type of load average, as read out of kmem. */
23#define LOAD_AVE_TYPE long
24
25/* Convert that into an integer that is 100 for a load average of 1.0 */
26#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
27
28#ifdef __arch64__ /* GCC, 64-bit ABI. */ 22#ifdef __arch64__ /* GCC, 64-bit ABI. */
29 23
30#define BITS_PER_LONG 64 24#define BITS_PER_LONG 64
@@ -34,4 +28,3 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
34#endif 28#endif
35 29
36#endif /* __arch64__ */ 30#endif /* __arch64__ */
37
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 <http://www.gnu.org/licenses/>. */
21 does not define it automatically. 21 does not define it automatically.
22 Ones defined so far include m68k and many others */ 22 Ones defined so far include m68k and many others */
23 23
24/* Data type of load average, as read out of kmem. */
25#define LOAD_AVE_TYPE long
26
27/* Convert that into an integer that is 100 for a load average of 1.0 */
28#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
29
30/* Define VIRT_ADDR_VARIES if the virtual addresses of 24/* Define VIRT_ADDR_VARIES if the virtual addresses of
31 pure and impure space as loaded can vary, and even their 25 pure and impure space as loaded can vary, and even their
32 relative order cannot be relied on. 26 relative order cannot be relied on.
@@ -46,4 +40,3 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
46 If you've just fixed a problem in an existing configuration file, 40 If you've just fixed a problem in an existing configuration file,
47 you should also check `etc/MACHINES' to make sure its descriptions 41 you should also check `etc/MACHINES' to make sure its descriptions
48 of known problems in that configuration should be updated. */ 42 of known problems in that configuration should be updated. */
49
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 <http://www.gnu.org/licenses/>. */
20 20
21/* #define vax -- appears to be done automatically */ 21/* #define vax -- appears to be done automatically */
22 22
23/* USG systems I know of running on Vaxes do not actually
24 support the load average, so disable it for them. */
25
26/* Data type of load average, as read out of kmem. */
27#define LOAD_AVE_TYPE double
28
29/* Convert that into an integer that is 100 for a load average of 1.0 */
30#define LOAD_AVE_CVT(x) ((int) ((x) * 100.0))
31
32#define HAVE_FTIME 23#define HAVE_FTIME
33
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 <http://www.gnu.org/licenses/>. */
41 41
42/* Define HAVE_SOCKETS if system supports 4.2-compatible sockets. */ 42/* Define HAVE_SOCKETS if system supports 4.2-compatible sockets. */
43#define HAVE_SOCKETS 43#define HAVE_SOCKETS
44
45/* The file containing the kernel's symbol table is called /unix. */
46#define KERNEL_FILE "/unix"
47
48/* The kernel symbol where the load average is found is named avenrun. */
49#define LDAV_SYMBOL "avenrun"
50 44
51/* Special items needed to make Emacs run on this system. */ 45/* Special items needed to make Emacs run on this system. */
52 46
@@ -86,4 +80,3 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
86 Emacs currently calls xrealloc on the results of get_current_dir name, 80 Emacs currently calls xrealloc on the results of get_current_dir name,
87 to avoid a crash just use the Emacs implementation for that function. */ 81 to avoid a crash just use the Emacs implementation for that function. */
88#define BROKEN_GET_CURRENT_DIR_NAME 1 82#define BROKEN_GET_CURRENT_DIR_NAME 1
89
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 <http://www.gnu.org/licenses/>. */
37#define TABDLY OXTABS 37#define TABDLY OXTABS
38#define TAB3 OXTABS 38#define TAB3 OXTABS
39 39
40/* These aren't needed, since we have getloadavg. */
41#undef KERNEL_FILE
42#undef LDAV_SYMBOL
43
44#define NO_TERMIO 40#define NO_TERMIO
45 41
46/* If the system's imake configuration file defines `NeedWidePrototypes' 42/* If the system's imake configuration file defines `NeedWidePrototypes'
@@ -72,12 +68,5 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
72 a file that someone else has modified in his Emacs. */ 68 a file that someone else has modified in his Emacs. */
73#define CLASH_DETECTION 69#define CLASH_DETECTION
74 70
75/* The file containing the kernel's symbol table is called /vmunix. */
76#define KERNEL_FILE "/vmunix"
77
78/* The kernel symbol where the load average is found is named _avenrun. */
79#define LDAV_SYMBOL "_avenrun"
80
81/* Send signals to subprocesses by "typing" special chars at them. */ 71/* Send signals to subprocesses by "typing" special chars at them. */
82#define SIGNALS_VIA_CHARACTERS 72#define SIGNALS_VIA_CHARACTERS
83
diff --git a/src/s/freebsd.h b/src/s/freebsd.h
index 222ebc91c4a..24b34e02f69 100644
--- a/src/s/freebsd.h
+++ b/src/s/freebsd.h
@@ -25,8 +25,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
25 25
26#define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base) 26#define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base)
27 27
28#define HAVE_GETLOADAVG 1
29
30/* This silences a few compilation warnings. */ 28/* This silences a few compilation warnings. */
31#undef BSD_SYSTEM 29#undef BSD_SYSTEM
32#if __FreeBSD__ == 1 30#if __FreeBSD__ == 1
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 <http://www.gnu.org/licenses/>. */
47 a file that someone else has modified in his Emacs. */ 47 a file that someone else has modified in his Emacs. */
48#define CLASH_DETECTION 48#define CLASH_DETECTION
49 49
50/* The symbol in the kernel where the load average is found
51 depends on the cpu type, so we let the m- files define LDAV_SYMBOL. */
52
53/* Special hacks needed to make Emacs run on this system. */ 50/* Special hacks needed to make Emacs run on this system. */
54 51
55/* In hpux, the symbol SIGIO is defined, but the feature 52/* In hpux, the symbol SIGIO is defined, but the feature
@@ -91,9 +88,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
91#undef random 88#undef random
92#undef HAVE_RANDOM 89#undef HAVE_RANDOM
93 90
94/* AlainF 20-Jul-1996 says this is right. */
95#define KERNEL_FILE "/stand/vmunix"
96
97 91
98/* Rainer Malzbender <rainer@displaytech.com> says definining 92/* Rainer Malzbender <rainer@displaytech.com> says definining
99 HAVE_XRMSETDATABASE allows Emacs to compile on HP-UX 10.20 using GCC. */ 93 HAVE_XRMSETDATABASE allows Emacs to compile on HP-UX 10.20 using GCC. */
@@ -119,18 +113,3 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
119#define DATA_SEG_BITS 0x40000000 113#define DATA_SEG_BITS 0x40000000
120 114
121#define DATA_START 0x40000000 115#define DATA_START 0x40000000
122
123/* Data type of load average, as read out of kmem. */
124#define LOAD_AVE_TYPE double
125
126/* Convert that into an integer that is 100 for a load average of 1.0 */
127#define LOAD_AVE_CVT(x) ((int) (x * 100.0))
128
129/* The kernel symbol where the load average is found is named _avenrun.
130 At this time there are two major flavors of hp-ux (there is the s800
131 and s300 (s200) flavors). The differences are thusly moved to the
132 corresponding machine description file. */
133
134/* No underscore please. */
135#define LDAV_SYMBOL "avenrun"
136
diff --git a/src/s/netbsd.h b/src/s/netbsd.h
index 8a639b93c84..52cda717a2d 100644
--- a/src/s/netbsd.h
+++ b/src/s/netbsd.h
@@ -21,8 +21,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
21/* Get most of the stuff from bsd-common. */ 21/* Get most of the stuff from bsd-common. */
22#include "bsd-common.h" 22#include "bsd-common.h"
23 23
24#define HAVE_GETLOADAVG 1
25
26#define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base) 24#define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base)
27 25
28#define DEFAULT_SOUND_DEVICE "/dev/audio" 26#define DEFAULT_SOUND_DEVICE "/dev/audio"
@@ -43,4 +41,3 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
43 41
44/* Use the GC_MAKE_GCPROS_NOOPS (see lisp.h) method. */ 42/* Use the GC_MAKE_GCPROS_NOOPS (see lisp.h) method. */
45#define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS 43#define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS
46
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 <http://www.gnu.org/licenses/>. */
49 pty_name[sizeof(pty_name) - 1] = 0; \ 49 pty_name[sizeof(pty_name) - 1] = 0; \
50 } 50 }
51 51
52/* Data type of load average, as read out of kmem. */
53#define LOAD_AVE_TYPE long
54
55/* Convert that into an integer that is 100 for a load average of 1.0 */
56/* This is totally uncalibrated. */
57#define LOAD_AVE_CVT(x) ((int) (((double) (x)) * 100.0 / FSCALE))
58#define FSCALE 256.0
59
60
61#define PENDING_OUTPUT_COUNT(FILE) ((FILE)->__ptr - (FILE)->__base) 52#define PENDING_OUTPUT_COUNT(FILE) ((FILE)->__ptr - (FILE)->__base)
62
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 <http://www.gnu.org/licenses/>. */
30 It sets the Lisp variable system-type. */ 30 It sets the Lisp variable system-type. */
31#define SYSTEM_TYPE "usg-unix-v" 31#define SYSTEM_TYPE "usg-unix-v"
32 32
33/* The file containing the kernel's symbol table is called /unix. */
34#define KERNEL_FILE "/unix"
35
36/* The kernel symbol where the load average is found is named avenrun. */
37#define LDAV_SYMBOL "avenrun"
38
39/* setjmp and longjmp can safely replace _setjmp and _longjmp, 33/* setjmp and longjmp can safely replace _setjmp and _longjmp,
40 but they will run slower. */ 34 but they will run slower. */
41#define _setjmp setjmp 35#define _setjmp setjmp
@@ -105,4 +99,3 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
105 99
106/* This definition was suggested for next release. So give it a try. */ 100/* This definition was suggested for next release. So give it a try. */
107#define HAVE_SOCKETS 101#define HAVE_SOCKETS
108
generated by cgit v1.2.1 (git 2.18.0) at 2026-01-18 05:21:19 +0000