mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-19 11:30:06 +00:00
d68171edce
Sat Sep 28 03:02:49 1996 Ulrich Drepper <drepper@cygnus.com> * dirent/Makefile (routines): Add readdir_r. * dirent/readdir_r.c: New file. Wrapper around readdir.c. * dirent/dirent.h: Add prototype for readdir_r. * misc/hsearch_r.c (ENTRY): Make field `used' of type `unsigned int' to prevent warnings. * sysdeps/unix/sysv/linux/getsysstats.c (get_proc_path): Initialize `result'. Sat Sep 28 01:16:42 1996 Ulrich Drepper <drepper@cygnus.com> * sysdeps/generic/strsep.c: Rename to __strsep and make strsep weak alias. * string/string.h: Add prototype for __strsep. * misc/mntent_r.c: Use __strsep instead of strsep to keep namespace clean. * sysdeps/stub/nanosleep.c: Rename to __libc_nanosleep and make __nanosleep and nanosleep weak aliases. * sysdeps/unix/sysv/linux/syscalls.list: Add __nanosleep as weak alias. * sysdeps/unix/sysv/linux/sleep.c: Call __nanosleep instead of nanosleep to keep namespace clean. * sysdeps/posix/ttyname.c (ttyname): Add cast to prevent warning. * sysdeps/posix/ttyname_r.c (ttyname_r): Likewise. * sysdeps/posix/getcwd.c (__getcwd): Likewise. * sysdeps/unix/nlist.c: Use ISO C definition since we don't always have prototype. * login/Makefile (headers): Add pty.h. * login/pty.h: New file. * sysdeps/generic/pty.h: Include <pty.h>. * login/pututline_r.c: Add cast to prevent warning. * gmon/gmon.c: Add prototype for __profile_frequency. (monstartup): Add cast to prevent warning. * sysdeps/generic/prof-freq.c: Change to use ISO C style definition. * locale/programs/ld-time.c (time_output): Write `era' information in correct order. Sat Sep 28 00:11:08 1996 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/syscalls.list: Add weak alias `adjtimex'. Set caller for mlock, mlockall, mremap, munlock, and munlockall to EXTRA. Reported by Matthias Urlichs <smurf@smurf.noris.de>. 1996-09-27 Paul Eggert <eggert@twinsun.com> * strftime.c (strftime): Output incomplete formats like %E at end of string. 1996-09-27 Paul Eggert <eggert@twinsun.com> * strftime.c (strftime): Add support for %EC and %Ey. Fix support for %EY. This uses the new _nl_get_era_entry function. Fri Sep 27 14:12:27 1996 Ulrich Drepper <drepper@cygnus.com> Security related patch by Elliot Lee <sopwith@redhat.com> and David Holland <dholland@eecs.harvard.edu>. * inet/rexec.c (rexec): Increase size of `num' array from 8 to 32. * inet/ruserpass.c (ruserpass): Don't allow $HOME envvar to not exist. * sysdeps/generic/getenv.c (__secure_getenv): New function. Return NULL when programs runs with SUID or SGID enabled. * sysdeps/stub/getenv.c: Make __secure_getenv an alias of getenv. * stdlib/stdlib.h: Add prototype for __secure_getenv. * locale/setlocale.c: Use __secure_getenv. * resolv/res_init.c: Likewise. * resolv/res_query.c: Likewise. * inet/ruserpass.c: Likewise. * sysdeps/posix/tempname.c: Likewise. * malloc/mtrace.c: Likewise. * catgets/catgets.c: Likewise. Make temporary file handling functions reentrant. * stdio-common/tmpnam.c: Rewrite to have own buffer to write result to. The called __stdio_gen_tempname function must be thread safe. * stdio-common/tmpnam_r.c: New file. * stdio/stdio.h: Add prototype for `tmpnam_r'. Change prototype for __stdio_gen_tempname. * stdio/libio.h: Likewise. * sysdeps/posix/tempname.c: Add new parameters and use them instead of static buffer. Don't reset `indeces' when PID changed between calls. Don't fail for long running programs when index counter once reached the limit. * sysdeps/stub/tempname.c: Likewise. * stdio-common/tempnam.c: Provide local buffer as extra argument to __stdio_gen_tempname. This makes this function reentrant. * stdio-common/tmpfile.c: Likewise. * stdio-common/temptest.c: Provide extra argument to __stdio_gen_tempname. * manual/filesys.texi: Describe tmpnam_r and add comments about reentrancy of the functions. * inet/rcmd.c: Fixed address length handling. * sysdeps/posix/mk-stdiolim.c: Count final \0 byte in L_tmpnam value. * time/strftime.c: Remove unused variables alt_digits and end_alt_digits. * sysdeps/unix/sysv/linux/sys/sysinfo.h: Correct prototype names for get_nprocs and get_nprocs_conf. * sysdeps/generic/sys/sysinfo.h: Likewise. * stdlib/test-canon.c: Finally do the right fix. * misc/Makefile: Only compile force-wrapper when compiling reentrant libc.
198 lines
5.8 KiB
C
198 lines
5.8 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 <errno.h>
|
|
#include <mntent.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)
|