mirror of
git://sourceware.org/git/glibc.git
synced 2024-12-21 04:31:04 +08:00
84384f5b6a
Wed Nov 20 02:04:11 1996 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/sigsuspend.c: Make sigsuspend a weak alias of __sigsuspend. * grp/grp.h: Correct comment about POSIX compliance. * pwd/pwd.h: Likewise. * login/utmp.h: Update copyright and pretty-print prototypes. * sysdeps/generic/paths.h: Add _PATH_LASTLOG, _PATH_UTMP and _PATH_WTMP from utmpbits.h. * sysdeps/unix/sysv/linux/paths.h: Likewise. * sysdeps/generic/utmpbits.h: Remove here. * sysdeps/gnu/utmpbits.h: Likewise. * misc/sys/uio.h: Place __BEGIN_DECLS correctly. Pretty-print prototypes. * sysdeps/unix/sysv/linux/sparc/clone.S: New file. Taken from LinuxThreads-0.5. Tue Nov 19 13:43:07 1996 Richard Henderson <rth@tamu.edu> * inet/ether_hton.c: Include <string.h>. * inet/ether_ntoh.c: Likewise. * inet/rexec.c: Get errno, index, getpass, getlogin from headers. * misc/search.h: Fix hcreate_r argument type (unsigned -> size_t). * misc/sys/cdefs.h: Change __long_double_t definition from typedef to define. Jim Nance reports problems building XEmacs otherwise. * resolv/gethnamaddr.c: Protect h_errno redefinition. * resolv/getnetnamadr.c: Likewise. * resolv/herror.c: Likewise. * sysdeps/generic/sigset.h (__SIGSETFN): Operator ## doesn't work with -traditional. Reported by Eric Youngdale. While we're at this, don't do error checking in the __ functions. This is consistent with the sysv4 definitions and seems Right. * signal/signal.h: Don't __OPTIMIZE__ sigops to __ versions. Add prototype for __sigsuspend. * sysdeps/posix/sigblock.c: Optimize sigmask <-> sigset_t conversions for sigset_t == unsigned long. De-ansidecl-ify. Reformat copyright. * sysdeps/posix/sigpause.c: Likewise. * sysdeps/posix/sigsetmask.c: Likewise. * sysdeps/posix/sigvec.c: Likewise. * sysdeps/posix/sigintr.c: Reformat copyright. * sysdeps/posix/signal.c: Check signal number out of range since __sigismember doesn't anymore. Reformat copyright. * sysdeps/posix/sigwait.c: Use __ versions of sigfillset, sigismember, sigdelset, sigaction, and sigsuspend. * stdlib/drand48-iter.c (__drand48_iterate): Cast state fragments to the wider type before shifting. * sysdeps/alpha/bsd-_setjmp.S: Silence assembler warning "$at used without .set noat" in profiling hook. * sysdeps/alpha/bsd-setjmp.S: Likewise. * sysdeps/alpha/htonl.S: Likewise. * sysdeps/alpha/htons.S: Likewise. * sysdeps/alpha/s_copysign.S: Likewise. * sysdeps/alpha/setjmp.S: Likewise. * sysdeps/alpha/stpcpy.S: Likewise. * sysdeps/alpha/strcat.S: Likewise. * sysdeps/alpha/strcpy.S: Likewise. * sysdeps/alpha/strncat.S: Likewise. * sysdeps/unix/sysv/linux/alpha/brk.S: Likewise. * sysdeps/unix/sysv/linux/alpha/clone.S: Likewise. * sysdeps/unix/sysv/linux/alpha/ieee_get_fp_control.S: Likewise. * sysdeps/unix/sysv/linux/alpha/ieee_set_fp_control.S: Likewise. * sysdeps/unix/sysv/linux/alpha/llseek.S: Likewise. * sysdeps/unix/sysv/linux/alpha/sigsuspend.S: Likewise. Rename function to __sigsuspend and add weak alias. * sysdeps/unix/sysv/linux/alpha/syscall.S: Likewise. Add missing END. * sysdeps/alpha/w_sqrt.S: Define _ERRNO_H so <errnos.h> defines EDOM. * sysdeps/unix/execve.S: Match PSEUDO_END symbol with the symbol SYSCALL__ actually generated. * sysdeps/unix/sysv/linux/errnos.h [_LIBC_REENTRANT]: Reflexively #define __set_errno, as several imported subsystems (eg. BIND) check that the symbol is defined. * sysdeps/unix/sysv/linux/getsysstats.c: Include <alloca.h>. * sysdeps/alpha/memcpy.S: Temporarily remove until I can find a bug that manifests in GCC. Tue Nov 19 11:10:05 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> * sysdeps/posix/writev.c (writev): COUNT parm is now int. * sysdeps/posix/readv.c (readv): Likewise. Tue Nov 19 15:28:29 1996 Ulrich Drepper <drepper@cygnus.com> * nss/nss_dns/dns-network.c: Change return type of all functions to enum nss_status. Reported by NIIBE Yutaka. * nss/nss_dns/dns-host.c: Update copyright. Fri Nov 15 20:16:38 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * config.make.in: Remove definition of top_absdir. * configure.in: Likewise. Use $(..) instead. * Makerules (make-link): Use $(..) to find rellns-sh script. Sat Nov 16 15:52:29 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * manual/nss.texi (Name Service Switch): Fix reference to `frobnicate'. Fri Nov 15 22:08:33 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/unix/sysv/linux/Makefile (sysdep_headers): Add sys/mtio.h. Mon Nov 18 05:51:13 1996 Ulrich Drepper <drepper@cygnus.com> * sysdeps/generic/waitstatus.h (__WIFSIGNALED): Rename local variable from __stat to __status to prevent shadowing. * sunrpc/rpc/clnt.h (clntudp_create, clntudp_bufcreate): Likewise for parameter __wait. Reported by NIIBE Yutaka. Mon Nov 18 02:05:38 1996 Ulrich Drepper <drepper@cygnus.com> * misc/regexp.c: New file. Implementation of obsolete interface to regular expression matcher (required in XPG4.2). * misc/regexp.h: New file. Header for above. * misc/Makefile (headers): Add regexp.h. (routines): Add regexp.c. Update copyright. Sun Nov 17 21:50:24 1996 Andreas Jaeger <aj@arthur.pfalz.de> * stdlib/tst-strtod.c (main): Add arguments for main. * stdlib/tst-strtol.c (main): Likewise. Sun Nov 17 21:15:05 1996 Ulrich Drepper <drepper@cygnus.com> * configure.in: Substitute libc_cv_slibdir and libc_cv_sysconfdir in output files. * sysdepes/unix/sysv/linux/configure: Define libc_cv_slibdir to /lib and sysconfdir to /etc if $prefix is /usr. * config.make.in: Add slibdir, sysconfdir and BASH to be replaced. * elf/Makefile ($(objpfx)ldd): Install ldd.bash.in if $(have-bash2) is yes. * elf/ldd.bash.in: Add copyright and various cleanups. * elf/ldd.sh.in: Likewise. Implement RTLD_NEXT. * elf/dlfcn.h: Define RTLD_NEXT. * elf/dl-deps.c: Build second searchlist which contains duplicates. * elf/dl-lookup.c (_dl_lookup_symbol_skip): New function. Used for RTLD_NEXT lookup. Rewrite _dl_lookup_symbol to put common parts for both lookup functions in a separate function. * elf/dlsym.c: Handle RTLD_NEXT by calling _dl_lookup_symbol_skip. * elf/link.h (struct link_map): Add l_dupsearchlist and l_ndupsearchlist. Add prototype for _dl_lookup_symbol_skip. * sunrpc/Makefile (rpcsvc): Add rusers. * sunrpc/rpcsvc/rnusers.x: Remove. Obsolteted by rusers.x. * sunrpc/rpcsvc/rusers.x: New file. Sun Nov 17 04:24:35 1996 Ulrich Drepper <drepper@cygnus.com> * stdio-common/vfprintf.c [USE_IN_LIBIO] (buffered_vfprintf): Call __libc_lock_init for local lock. Reported by a sun <asun@zoology.washington.edu>. [!USE_IN_LIBIO] (PAD): Optimize a bit.
200 lines
5.9 KiB
C
200 lines
5.9 KiB
C
/* getsysstats - Determine various system internal values, Linux version.
|
|
Copyright (C) 1996 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Library General Public License as
|
|
published by the Free Software Foundation; either version 2 of the
|
|
License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Library General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
License along with the GNU C Library; see the file COPYING.LIB. If not,
|
|
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
Boston, MA 02111-1307, USA. */
|
|
|
|
#include <alloca.h>
|
|
#include <errno.h>
|
|
#include <mntent.h>
|
|
#include <paths.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
#include <sys/sysinfo.h>
|
|
|
|
|
|
/* Determine the path to the /proc filesystem if available. */
|
|
static char *
|
|
get_proc_path (char *buffer, size_t bufsize)
|
|
{
|
|
FILE *fp;
|
|
struct mntent mount_point;
|
|
struct mntent *entry;
|
|
char *result = NULL;
|
|
|
|
/* First find the mount point of the proc filesystem. */
|
|
fp = __setmntent (_PATH_MNTTAB, "r");
|
|
if (fp != NULL)
|
|
{
|
|
while ((entry = __getmntent_r (fp, &mount_point, buffer, bufsize))
|
|
!= NULL)
|
|
if (strcmp (mount_point.mnt_type, "proc") == 0)
|
|
{
|
|
result = mount_point.mnt_dir;
|
|
break;
|
|
}
|
|
__endmntent (fp);
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
|
|
/* How we can determine the number of available processors depends on
|
|
the configuration. There is currently (as of version 2.0.21) no
|
|
system call to determine the number. It is planned for the 2.1.x
|
|
series to add this, though.
|
|
|
|
One possibility to implement it for systems using Linux 2.0 is to
|
|
examine the pseudo file /proc/meminfo. Here we have one entry for
|
|
each processor.
|
|
|
|
But not all systems have support for the /proc filesystem. If it
|
|
is not available we simply return 1 since there is no way. */
|
|
int
|
|
__get_nprocs ()
|
|
{
|
|
FILE *fp;
|
|
char buffer[8192];
|
|
char *proc_path;
|
|
int result = 1;
|
|
|
|
/* XXX Here will come a test for the new system call. */
|
|
|
|
/* Get mount point of proc filesystem. */
|
|
proc_path = get_proc_path (buffer, sizeof buffer);
|
|
|
|
/* If we haven't found an appropriate entry return 1. */
|
|
if (proc_path != NULL)
|
|
{
|
|
char *proc_cpuinfo = alloca (strlen (proc_path) + sizeof ("/cpuinfo"));
|
|
__stpcpy (__stpcpy (proc_cpuinfo, proc_path), "/cpuinfo");
|
|
|
|
fp = fopen (proc_cpuinfo, "r");
|
|
if (fp != NULL)
|
|
{
|
|
result = 0;
|
|
/* Read all lines and count the lines starting with the
|
|
string "processor". We don't have to fear extremely long
|
|
lines since the kernel will not generate them. 8192
|
|
bytes are really enough. */
|
|
while (fgets (buffer, sizeof buffer, fp) != NULL)
|
|
if (strncmp (buffer, "processor", 9) == 0)
|
|
++result;
|
|
|
|
fclose (fp);
|
|
}
|
|
}
|
|
|
|
return result;
|
|
}
|
|
weak_alias (__get_nprocs, get_nprocs)
|
|
|
|
/* As far as I know Linux has no separate numbers for configured and
|
|
available processors. So make the `get_nprocs_conf' function an
|
|
alias. */
|
|
strong_alias (__get_nprocs, __get_nprocs_conf)
|
|
weak_alias (__get_nprocs, get_nprocs_conf)
|
|
|
|
|
|
/* General function to get information about memory status from proc
|
|
filesystem. */
|
|
static int
|
|
phys_pages_info (const char *format)
|
|
{
|
|
FILE *fp;
|
|
char buffer[8192];
|
|
char *proc_path;
|
|
int result = -1;
|
|
|
|
/* Get mount point of proc filesystem. */
|
|
proc_path = get_proc_path (buffer, sizeof buffer);
|
|
|
|
/* If we haven't found an appropriate entry return 1. */
|
|
if (proc_path != NULL)
|
|
{
|
|
char *proc_meminfo = alloca (strlen (proc_path) + sizeof ("/meminfo"));
|
|
__stpcpy (__stpcpy (proc_meminfo, proc_path), "/meminfo");
|
|
|
|
fp = fopen (proc_meminfo, "r");
|
|
if (fp != NULL)
|
|
{
|
|
result = 0;
|
|
/* Read all lines and count the lines starting with the
|
|
string "processor". We don't have to fear extremely long
|
|
lines since the kernel will not generate them. 8192
|
|
bytes are really enough. */
|
|
while (fgets (buffer, sizeof buffer, fp) != NULL)
|
|
if (sscanf (buffer, format, &result) == 1)
|
|
{
|
|
result /= (__getpagesize () / 1024);
|
|
break;
|
|
}
|
|
|
|
fclose (fp);
|
|
}
|
|
}
|
|
|
|
if (result == -1)
|
|
/* We cannot get the needed value: signal an error. */
|
|
__set_errno (ENOSYS);
|
|
|
|
return result;
|
|
}
|
|
|
|
|
|
/* Return the number of pages of physical memory in the system. There
|
|
is currently (as of version 2.0.21) no system call to determine the
|
|
number. It is planned for the 2.1.x series to add this, though.
|
|
|
|
One possibility to implement it for systems using Linux 2.0 is to
|
|
examine the pseudo file /proc/cpuinfo. Here we have one entry for
|
|
each processor.
|
|
|
|
But not all systems have support for the /proc filesystem. If it
|
|
is not available we return -1 as an error signal. */
|
|
int
|
|
__get_phys_pages ()
|
|
{
|
|
/* XXX Here will come a test for the new system call. */
|
|
|
|
return phys_pages_info ("MemTotal: %d kB");
|
|
}
|
|
weak_alias (__get_phys_pages, get_phys_pages)
|
|
|
|
|
|
/* Return the number of available pages of physical memory in the
|
|
system. There is currently (as of version 2.0.21) no system call
|
|
to determine the number. It is planned for the 2.1.x series to add
|
|
this, though.
|
|
|
|
One possibility to implement it for systems using Linux 2.0 is to
|
|
examine the pseudo file /proc/cpuinfo. Here we have one entry for
|
|
each processor.
|
|
|
|
But not all systems have support for the /proc filesystem. If it
|
|
is not available we return -1 as an error signal. */
|
|
int
|
|
__get_avphys_pages ()
|
|
{
|
|
/* XXX Here will come a test for the new system call. */
|
|
|
|
return phys_pages_info ("MemFree: %d kB");
|
|
}
|
|
weak_alias (__get_avphys_pages, get_avphys_pages)
|