diff options
author | Ulrich Drepper <drepper@redhat.com> | 1999-07-31 06:11:24 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 1999-07-31 06:11:24 +0000 |
commit | bdb04ee8e21c3ee229bf3d2ad2ca8288e3cb44e9 (patch) | |
tree | efe99ba63e77cedcf730e424a1fcb0f5ef7a09ad /sysdeps/unix/sysv/linux/getsysstats.c | |
parent | 3d558f4ec7fecbac0dddb4d321a1ec10f14e8e03 (diff) | |
download | glibc-bdb04ee8e21c3ee229bf3d2ad2ca8288e3cb44e9.zip glibc-bdb04ee8e21c3ee229bf3d2ad2ca8288e3cb44e9.tar.gz glibc-bdb04ee8e21c3ee229bf3d2ad2ca8288e3cb44e9.tar.bz2 |
Update.
1999-07-30 Andreas Schwab <schwab@suse.de>
* sysdeps/unix/sysv/linux/getsysstats.c (GET_NPROCS_PARSER): New
definition.
(__get_nprocs): Use it.
(__get_nprocs_conf): Define as separate function if
GET_NPROCS_CONF_PARSER is defined.
* sysdeps/unix/sysv/linux/alpha/getsysstats.c: New file.
* include/sys/sysinfo.h: New file.
* sysdeps/generic/sys/sysinfo.h: Remove declaration of internal
interface.
* sysdeps/unix/sysv/linux/sys/sysinfo.h: Likewise.
1999-07-30 H.J. Lu <hjl@gnu.org>
* libio/iofflush.c (fflush_unlocked): Weak aliase if
_IO_MTSAFE_IO is not defined.
* libio/clearerr.c (clearerr_unlocked): Likewise.
* libio/feof.c (feof_unlocked): Likewise.
* libio/ferror.c (ferror_unlocked): Likewise.
* libio/fputc.c (fputc_unlocked): Likewise.
* libio/getc.c (getc_unlocked, fgetc_unlocked): Likewise.
* libio/getchar.c (getchar_unlocked): Likewise.
* libio/putc.c (putc_unlocked): Likewise.
* libio/putchar.c (putchar_unlocked): Likewise.
1999-07-30 Thorsten Kukuk <kukuk@suse.de>
* sunrpc/Versions: Add svc_getreq_common, svc_getreq_poll,
svc_max_pollfd and svc_pollfd to GLIBC_2.2
* sunrpc/rpc/svc.h: Use rpc*_t types, add new prototypes
for svc_run/poll interface.
* sunrpc/rpc/types.h: Add rpc*_t typedefs.
* sunrpc/rpc_common.c: Add svc_pollfd and svc_max_pollfd as
global variable.
* sunrpc/svc.c: Add svc_getreq_poll and svc_getreq_common,
rewrite other svc_getreq* functions to use svc_getreq_common.
* sunrpc/svc_run.c: Use poll().
1999-07-30 Andreas Schwab <schwab@suse.de>
* Makerules: Put sysd-versions and Versions.all on
postclean-generated instead of common-generated.
1999-07-29 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* manual/time.texi (Basic CPU Time): Note that clock_t can wrap
around and CLOCKS_PER_SEC is 1e6.
Diffstat (limited to 'sysdeps/unix/sysv/linux/getsysstats.c')
-rw-r--r-- | sysdeps/unix/sysv/linux/getsysstats.c | 69 |
1 files changed, 57 insertions, 12 deletions
diff --git a/sysdeps/unix/sysv/linux/getsysstats.c b/sysdeps/unix/sysv/linux/getsysstats.c index 58f55ac..be23753 100644 --- a/sysdeps/unix/sysv/linux/getsysstats.c +++ b/sysdeps/unix/sysv/linux/getsysstats.c @@ -1,5 +1,5 @@ /* Determine various system internal values, Linux version. - Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. @@ -67,6 +67,25 @@ get_proc_path (char *buffer, size_t bufsize) But not all systems have support for the /proc filesystem. If it is not available we simply return 1 since there is no way. */ + +/* Other architectures use different formats for /proc/cpuinfo. This + provides a hook for alternative parsers. */ +#ifndef GET_NPROCS_PARSER +# define GET_NPROCS_PARSER(FP, BUFFER, RESULT) \ + do \ + { \ + (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_unlocked (BUFFER, sizeof (BUFFER), FP) != NULL) \ + if (strncmp (BUFFER, "processor", 9) == 0) \ + ++(RESULT); \ + } \ + while (0) +#endif + int __get_nprocs () { @@ -89,15 +108,7 @@ __get_nprocs () 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_unlocked (buffer, sizeof buffer, fp) != NULL) - if (strncmp (buffer, "processor", 9) == 0) - ++result; - + GET_NPROCS_PARSER (fp, buffer, result); fclose (fp); } } @@ -106,12 +117,46 @@ __get_nprocs () } weak_alias (__get_nprocs, get_nprocs) + +#ifdef GET_NPROCS_CONF_PARSER +/* On some architectures it is possible to distinguish between configured + and active cpus. */ +int +__get_nprocs_conf () +{ + 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) + { + GET_NPROCS_CONF_PARSER (fp, buffer, result); + fclose (fp); + } + } + + return result; +} +#else /* 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) - +#endif +weak_alias (__get_nprocs_conf, get_nprocs_conf) /* General function to get information about memory status from proc filesystem. */ |