diff options
Diffstat (limited to 'sysdeps/unix/sysv/linux')
| -rw-r--r-- | sysdeps/unix/sysv/linux/alpha/getsysstats.c | 54 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/getsysstats.c | 69 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sys/sysinfo.h | 6 |
3 files changed, 112 insertions, 17 deletions
diff --git a/sysdeps/unix/sysv/linux/alpha/getsysstats.c b/sysdeps/unix/sysv/linux/alpha/getsysstats.c new file mode 100644 index 0000000000..8588903c89 --- /dev/null +++ b/sysdeps/unix/sysv/linux/alpha/getsysstats.c @@ -0,0 +1,54 @@ +/* Determine various system internal values, Linux/Alpha version. + Copyright (C) 1999 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Andreas Schwab <schwab@suse.de> + + 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. */ + + +/* We need to define a special parser for /proc/cpuinfo. */ +#define GET_NPROCS_PARSER(FP, BUFFER, RESULT) \ + do \ + { \ + (RESULT) = 0; \ + /* Find the line that contains the information about the number of \ + active cpus. 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 (sscanf (BUFFER, "CPUs probed %*d active %d", &(RESULT)) == 1) \ + break; \ + } \ + while (0) + + +/* On the Alpha we can distinguish between the number of configured and + active cpus. */ +#define GET_NPROCS_CONF_PARSER(FP, BUFFER, RESULT) \ + do \ + { \ + (RESULT) = 0; \ + /* Find the line that contains the information about the number of \ + probed cpus. 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 (sscanf (buffer, "CPUs probed %d", &(RESULT)) == 1) \ + break; \ + } \ + while (0) + +#include <sysdeps/unix/sysv/linux/getsysstats.c> diff --git a/sysdeps/unix/sysv/linux/getsysstats.c b/sysdeps/unix/sysv/linux/getsysstats.c index 58f55ac99c..be23753d2f 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. */ diff --git a/sysdeps/unix/sysv/linux/sys/sysinfo.h b/sysdeps/unix/sysv/linux/sys/sysinfo.h index dc435d6651..2c17cf2a69 100644 --- a/sysdeps/unix/sysv/linux/sys/sysinfo.h +++ b/sysdeps/unix/sysv/linux/sys/sysinfo.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1996 Free Software Foundation, Inc. +/* Copyright (C) 1996, 1999 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -31,20 +31,16 @@ extern int sysinfo __P ((struct sysinfo *__info)); /* Return number of configured processors. */ -extern int __get_nprocs_conf __P ((void)); extern int get_nprocs_conf __P ((void)); /* Return number of available processors. */ -extern int __get_nprocs __P ((void)); extern int get_nprocs __P ((void)); /* Return number of physical pages of memory in the system. */ -extern int __get_phys_pages __P ((void)); extern int get_phys_pages __P ((void)); /* Return number of available physical pages of memory in the system. */ -extern int __get_avphys_pages __P ((void)); extern int get_avphys_pages __P ((void)); __END_DECLS |