From b85697f61d8aeeaeb8b91d50ab2c668b7fcbbd8a Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 18 Dec 1999 19:45:25 +0000 Subject: Update. 1999-12-17 Ulrich Drepper * string/bits/string2.h (__strtok_r_1c): Help gcc optimizing string access. * locale/programs/ld-collate.c: Implement handling of absolute ellipsis. Parsing of file and constructing the internal data structures should now be complete. (collate_finish): Start adding support to generate the data structures which are written out to the file. * intl/dcgettext.c: Rewrite to handle caching of previous results here instead of in the dcgettext macro. * intl/libintl.h (dcgettext): Don't define for systems using this glibc or systems with tsearch. * sysdeps/generic/mathdef.h: Protect definitions for math.h against double inclusion. * sysdeps/alpha/fpu/bits/mathdef.h: Likewise. * sysdeps/i386/fpu/bits/mathdef.h: Likewise. * sysdeps/m68k/fpu/bits/mathdef.h: Likewise. * sysdeps/powerpc/fpu/bits/mathdef.h: Likewise. * sysdeps/i386/fpu/libm-test-ulps: Add more deltas (are mobile PIIs that different?). 1999-12-17 Andreas Jaeger * rt/aio.h (struct aiocb64): Add member __next_prio to sync the struct with aiocb. * rt/Makefile (tests): Added tst-aio64. Added dependency rules for tst-aio64. * rt/tst-aio64.c: New file, copied from tst-aio.c and changed for 64bit tests. 1999-12-15 Thorsten Kukuk * sysdeps/unix/sysv/linux/alpha/oldgetrlimit64.c: Removed. * sysdeps/unix/sysv/linux/alpha/oldsetrlimit64.c: Removed. * sysdeps/unix/sysv/linux/bits/resource.h: Change RLIM_INFINITY back to old value (signed long). * sysdeps/unix/sysv/linux/i386/bits/resource.h: New, with unsigned long RLIM_INFINITY. * sysdeps/unix/sysv/linux/getrlimit.c: Moved from here to ... * sysdeps/unix/sysv/linux/i386/getrlimit.c: ... here. * sysdeps/unix/sysv/linux/getrlimit64.c: Moved from here to ... * sysdeps/unix/sysv/linux/i386/getrlimit64.c: ... here. * sysdeps/unix/sysv/linux/oldgetrlimit64.c: Moved from here to ... * sysdeps/unix/sysv/linux/i386/oldgetrlimit64.c: ... here. * sysdeps/unix/sysv/linux/oldsetrlimit64.c: Moved from here to ... * sysdeps/unix/sysv/linux/i386/oldsetrlimit64.c: ... here. * sysdeps/unix/sysv/linux/setrlimit.c: Moved from here to ... * sysdeps/unix/sysv/linux/i386/setrlimit.c: ... here. * sysdeps/unix/sysv/linux/setrlimit64.c: Moved from here to ... * sysdeps/unix/sysv/linux/i386/setrlimit64.c: ... here. * sysdeps/unix/sysv/linux/sparc/bits/resource.h: New. * sysdeps/unix/sysv/linux/sparc/sparc64/oldgetrlimit64.c: Removed. * sysdeps/unix/sysv/linux/sparc/sparc64/oldsetrlimit64.c: Removed. 1999-12-17 Andreas Jaeger * elf/ldconfig.c: Add new option -l to manualy link shared libraries. (options): Added option. (parse_opt): Set option. (main): Handle option. (manual_link): New function. 1999-12-17 Thorsten Kukuk * string/bits/string2.h: Fix patch from 1999-12-07. 1999-12-16 Ulrich Drepper * sysdeps/generic/strsep.c: If delim string has only one character don't run over end of string. * locale/programs/ld-collate.c (insert_weights): Also update next pointer of last cursor element. (insert_value): Return nonzero value if nothing got inserted. (handle_ellipsis): Don't do anything if to-value cannot be inserted. 1999-12-10 Jakub Jelinek * stdlib/longlong.h (__sparc_v9__): Use %rDIGIT instead of %DIGIT where appropriate. 1999-12-10 Jakub Jelinek * sysdeps/unix/sysv/linux/sparc/sparc64/sigaction.c (__sigaction): Copy sa_flags into kernel sigaction structure. 1999-12-14 Andreas Jaeger * string/tester.c (test_strsep): More tests for access beyond the final NUL. The first two tests come from PR libc/1486 by martinea@iro.umontreal.ca. 1999-12-14 Thorsten Kukuk * nis/ypclnt.c: Correct handling of cached client handles. (__xdr_ypresp_all): Call callback function for errors, too, like Solaris does. * nis/nss_compat/compat-grp.c: Make sure errno is always set correct. * nis/nss_compat/compat-initgroups.c: Likewise. * nis/nss_compat/compat-spwd.c: Likewise. * nis/nss_nis/nis-alias.c: Likewise. * nis/nss_nis/nis-ethers.c: Likewise. * nis/nss_nis/nis-grp.c: Likewise. * nis/nss_nis/nis-hosts.c: Likewise. * nis/nss_nis/nis-netgrp.c: Likewise. * nis/nss_nis/nis-publickey.c: Likewise. * nis/nss_nis/nis-service.c: Likewise. Also use services.byservicename Map if available, optimize query if name/port and protocol is known. --- sysdeps/alpha/fpu/bits/mathdef.h | 4 +- sysdeps/generic/bits/mathdef.h | 4 +- sysdeps/generic/strsep.c | 4 +- sysdeps/i386/fpu/bits/mathdef.h | 4 +- sysdeps/i386/fpu/libm-test-ulps | 63 ++++-- sysdeps/m68k/fpu/bits/mathdef.h | 4 +- sysdeps/powerpc/fpu/bits/mathdef.h | 4 +- sysdeps/sparc/fpu/bits/mathdef.h | 4 +- sysdeps/unix/sysv/linux/alpha/oldgetrlimit64.c | 1 - sysdeps/unix/sysv/linux/alpha/oldsetrlimit64.c | 1 - sysdeps/unix/sysv/linux/bits/resource.h | 6 +- sysdeps/unix/sysv/linux/getrlimit.c | 84 ------- sysdeps/unix/sysv/linux/getrlimit64.c | 28 --- sysdeps/unix/sysv/linux/i386/bits/resource.h | 227 +++++++++++++++++++ sysdeps/unix/sysv/linux/i386/getrlimit.c | 84 +++++++ sysdeps/unix/sysv/linux/i386/getrlimit64.c | 28 +++ sysdeps/unix/sysv/linux/i386/oldgetrlimit64.c | 53 +++++ sysdeps/unix/sysv/linux/i386/oldsetrlimit64.c | 52 +++++ sysdeps/unix/sysv/linux/i386/setrlimit.c | 82 +++++++ sysdeps/unix/sysv/linux/i386/setrlimit64.c | 28 +++ sysdeps/unix/sysv/linux/oldgetrlimit64.c | 53 ----- sysdeps/unix/sysv/linux/oldsetrlimit64.c | 52 ----- sysdeps/unix/sysv/linux/setrlimit.c | 82 ------- sysdeps/unix/sysv/linux/setrlimit64.c | 28 --- sysdeps/unix/sysv/linux/sparc/bits/resource.h | 243 +++++++++++++++++++++ .../unix/sysv/linux/sparc/sparc64/oldgetrlimit64.c | 1 - .../unix/sysv/linux/sparc/sparc64/oldsetrlimit64.c | 1 - sysdeps/unix/sysv/linux/sparc/sparc64/sigaction.c | 1 + 28 files changed, 871 insertions(+), 355 deletions(-) delete mode 100644 sysdeps/unix/sysv/linux/alpha/oldgetrlimit64.c delete mode 100644 sysdeps/unix/sysv/linux/alpha/oldsetrlimit64.c delete mode 100644 sysdeps/unix/sysv/linux/getrlimit.c delete mode 100644 sysdeps/unix/sysv/linux/getrlimit64.c create mode 100644 sysdeps/unix/sysv/linux/i386/bits/resource.h create mode 100644 sysdeps/unix/sysv/linux/i386/getrlimit.c create mode 100644 sysdeps/unix/sysv/linux/i386/getrlimit64.c create mode 100644 sysdeps/unix/sysv/linux/i386/oldgetrlimit64.c create mode 100644 sysdeps/unix/sysv/linux/i386/oldsetrlimit64.c create mode 100644 sysdeps/unix/sysv/linux/i386/setrlimit.c create mode 100644 sysdeps/unix/sysv/linux/i386/setrlimit64.c delete mode 100644 sysdeps/unix/sysv/linux/oldgetrlimit64.c delete mode 100644 sysdeps/unix/sysv/linux/oldsetrlimit64.c delete mode 100644 sysdeps/unix/sysv/linux/setrlimit.c delete mode 100644 sysdeps/unix/sysv/linux/setrlimit64.c create mode 100644 sysdeps/unix/sysv/linux/sparc/bits/resource.h delete mode 100644 sysdeps/unix/sysv/linux/sparc/sparc64/oldgetrlimit64.c delete mode 100644 sysdeps/unix/sysv/linux/sparc/sparc64/oldsetrlimit64.c (limited to 'sysdeps') diff --git a/sysdeps/alpha/fpu/bits/mathdef.h b/sysdeps/alpha/fpu/bits/mathdef.h index f5d5de8b12..30f93dda1c 100644 --- a/sysdeps/alpha/fpu/bits/mathdef.h +++ b/sysdeps/alpha/fpu/bits/mathdef.h @@ -23,7 +23,9 @@ /* FIXME! This file describes properties of the compiler, not the machine; it should not be part of libc! */ -#if defined __USE_ISOC99 && defined _MATH_H +#if defined __USE_ISOC99 && defined _MATH_H && !defined _MATH_H_MATHDEF +# define _MATH_H_MATHDEF 1 + # ifdef __GNUC__ # if __STDC__ == 1 diff --git a/sysdeps/generic/bits/mathdef.h b/sysdeps/generic/bits/mathdef.h index d306e54366..0c30b01f52 100644 --- a/sysdeps/generic/bits/mathdef.h +++ b/sysdeps/generic/bits/mathdef.h @@ -20,7 +20,9 @@ # error "Never use directly; include instead" #endif -#if defined __USE_ISOC99 && defined _MATH_H +#if defined __USE_ISOC99 && defined _MATH_H && !defined _MATH_H_MATHDEF +# define _MATH_H_MATHDEF 1 + /* Normally, there is no long double type and the `float' and `double' expressions are evaluated as `double'. */ typedef double float_t; /* `float' expressions are evaluated as diff --git a/sysdeps/generic/strsep.c b/sysdeps/generic/strsep.c index 7ca44f3c3a..004d8d8ac2 100644 --- a/sysdeps/generic/strsep.c +++ b/sysdeps/generic/strsep.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1992, 1993, 1996, 1997, 1998 Free Software Foundation, Inc. +/* Copyright (C) 1992, 93, 96, 97, 98, 99 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 @@ -43,6 +43,8 @@ __strsep (char **stringp, const char *delim) { if (*begin == ch) end = begin; + else if (*begin == '\0') + end = NULL; else end = strchr (begin + 1, ch); } diff --git a/sysdeps/i386/fpu/bits/mathdef.h b/sysdeps/i386/fpu/bits/mathdef.h index ba5129895d..9436877a77 100644 --- a/sysdeps/i386/fpu/bits/mathdef.h +++ b/sysdeps/i386/fpu/bits/mathdef.h @@ -20,7 +20,9 @@ # error "Never use directly; include instead" #endif -#if defined __USE_ISOC99 && defined _MATH_H +#if defined __USE_ISOC99 && defined _MATH_H && !defined _MATH_H_MATHDEF +# define _MATH_H_MATHDEF 1 + /* The ix87 FPUs evaluate all values in the 80 bit floating-point format which is also available for the user as `long double'. Therefore we define: */ diff --git a/sysdeps/i386/fpu/libm-test-ulps b/sysdeps/i386/fpu/libm-test-ulps index 443117da63..195bcca168 100644 --- a/sysdeps/i386/fpu/libm-test-ulps +++ b/sysdeps/i386/fpu/libm-test-ulps @@ -488,10 +488,14 @@ Test "Real part of: ctanh (-2 - 3 i) == -0.9653858790221331242 + 0.0098843750383 ildouble: 2 ldouble: 2 Test "Imaginary part of: ctanh (-2 - 3 i) == -0.9653858790221331242 + 0.0098843750383224937 i": +float: 1 +ifloat: 1 ildouble: 23 ldouble: 23 Test "Real part of: ctanh (0 + pi/4 i) == 0.0 + 1.0 i": Test "Imaginary part of: ctanh (0 + pi/4 i) == 0.0 + 1.0 i": +float: 1 +ifloat: 1 double: 0.5 idouble: 0.5 Test "Real part of: ctanh (0.7 + 1.2 i) == 1.3472197399061191630 + 0.4778641038326365540 i": @@ -636,6 +640,9 @@ idouble: 1 Test "j0 (8.0) == 0.17165080713755390609": float: 1 ifloat: 1 +Test "j0 (10.0) == -0.24593576445134833520": +double: 2 +idouble: 2 # j1 Test "j1 (10.0) == 0.043472746168861436670": @@ -654,6 +661,8 @@ ifloat: 1 Test "jn (0, 10.0) == -0.24593576445134833520": float: 1 ifloat: 1 +double: 2 +idouble: 2 Test "jn (0, 2.0) == 0.22389077914123566805": float: 1 ifloat: 1 @@ -673,33 +682,46 @@ idouble: 1 Test "jn (1, 8.0) == 0.23463634685391462438": float: 1 ifloat: 1 +Test "jn (10, -1.0) == 0.26306151236874532070e-9": +float: 1 +ifloat: 1 Test "jn (10, 0.1) == 0.26905328954342155795e-19": double: 4 float: 2 idouble: 4 ifloat: 2 Test "jn (10, 0.7) == 0.75175911502153953928e-11": -double: 3 +double: 4 float: 1 -idouble: 3 +idouble: 4 ifloat: 1 -Test "jn (10, 2.0) == 0.25153862827167367096e-6": +Test "jn (10, 1.0) == 0.26306151236874532070e-9": float: 1 ifloat: 1 -double: 1 -idouble: 1 -Test "jn (10, 10.0) == 0.20748610663335885770": +Test "jn (10, 2.0) == 0.25153862827167367096e-6": float: 1 ifloat: 1 +double: 2 +idouble: 2 +Test "jn (10, 10.0) == 0.20748610663335885770": +float: 2 +ifloat: 2 +double: 4 +idouble: 4 Test "jn (3, 0.1) == 0.000020820315754756261429": double: 1 idouble: 1 Test "jn (3, 0.7) == 0.0069296548267508408077": double: 2 idouble: 2 +Test "jn (3, 2.0) == 0.12894324947440205110": +double: 1 +idouble: 1 Test "jn (3, 10.0) == 0.058379379305186812343": float: 1 ifloat: 1 +double: 3 +idouble: 3 # lgamma Test "lgamma (-0.5) == log(2*sqrt(pi))": @@ -847,6 +869,8 @@ float: 1 idouble: 1 ifloat: 1 Test "y0 (0.7) == -0.19066492933739506743": +float: 1 +ifloat: 1 double: 2 idouble: 2 Test "y0 (1.0) == 0.088256964215676957983": @@ -857,6 +881,8 @@ ifloat: 1 Test "y0 (1.5) == 0.38244892379775884396": float: 1 ifloat: 1 +double: 1 +idouble: 1 Test "y0 (2.0) == 0.51037567264974511960": double: 1 idouble: 1 @@ -891,9 +917,9 @@ idouble: 3 ifloat: 2 Test "y1 (2.0) == -0.10703243154093754689": double: 1 -float: 1 +float: 2 idouble: 1 -ifloat: 1 +ifloat: 2 Test "y1 (8.0) == -0.15806046173124749426": float: 2 ifloat: 2 @@ -905,6 +931,8 @@ float: 1 idouble: 1 ifloat: 1 Test "yn (0, 0.7) == -0.19066492933739506743": +float: 1 +ifloat: 1 double: 2 idouble: 2 Test "yn (0, 1.0) == 0.088256964215676957983": @@ -915,6 +943,8 @@ ifloat: 1 Test "yn (0, 1.5) == 0.38244892379775884396": float: 1 ifloat: 1 +double: 1 +idouble: 1 Test "yn (0, 2.0) == 0.51037567264974511960": double: 1 idouble: 1 @@ -947,9 +977,9 @@ idouble: 3 ifloat: 2 Test "yn (1, 2.0) == -0.10703243154093754689": double: 1 -float: 1 +float: 2 idouble: 1 -ifloat: 1 +ifloat: 2 Test "yn (1, 8.0) == -0.15806046173124749426": float: 2 ifloat: 2 @@ -974,8 +1004,8 @@ ifloat: 1 Test "yn (10, 2.0) == -129184.54220803928264": float: 1 ifloat: 1 -double: 1 -idouble: 1 +double: 2 +idouble: 2 Test "yn (3, 0.1) == -5099.3323786129048894": double: 1 float: 1 @@ -984,6 +1014,9 @@ ifloat: 1 Test "yn (3, 0.7) == -15.819479052819633505": double: 2 idouble: 2 +Test "yn (3, 2.0) == -1.1277837768404277861": +double: 1 +idouble: 1 Test "yn (3, 10.0) == -0.25136265718383732978": double: 1 float: 1 @@ -1263,6 +1296,8 @@ ildouble: 286 ldouble: 286 Function: Imaginary part of "ctanh": +float: 1 +ifloat: 1 double: 1 idouble: 1 ildouble: 3074 @@ -1313,8 +1348,8 @@ ldouble: 560 Function: "j0": float: 1 ifloat: 1 -double: 1 -idouble: 1 +double: 2 +idouble: 2 Function: "j1": double: 1 diff --git a/sysdeps/m68k/fpu/bits/mathdef.h b/sysdeps/m68k/fpu/bits/mathdef.h index 2f650ec8b5..c80dad3fe1 100644 --- a/sysdeps/m68k/fpu/bits/mathdef.h +++ b/sysdeps/m68k/fpu/bits/mathdef.h @@ -20,7 +20,9 @@ # error "Never use directly; include instead" #endif -#if defined __USE_ISOC99 && defined _MATH_H +#if defined __USE_ISOC99 && defined _MATH_H && !defined _MATH_H_MATHDEF +# define _MATH_H_MATHDEF 1 + /* The m68k FPUs evaluate all values in the 96 bit floating-point format which is also available for the user as `long double'. Therefore we define: */ diff --git a/sysdeps/powerpc/fpu/bits/mathdef.h b/sysdeps/powerpc/fpu/bits/mathdef.h index 71378c8458..577a596843 100644 --- a/sysdeps/powerpc/fpu/bits/mathdef.h +++ b/sysdeps/powerpc/fpu/bits/mathdef.h @@ -27,7 +27,9 @@ FIXME! This file does not deal with the -fshort-double option of gcc! */ -#if defined __USE_ISOC99 && defined _MATH_H +#if defined __USE_ISOC99 && defined _MATH_H && !defined _MATH_H_MATHDEF +# define _MATH_H_MATHDEF 1 + # ifdef __GNUC__ # if __STDC__ == 1 diff --git a/sysdeps/sparc/fpu/bits/mathdef.h b/sysdeps/sparc/fpu/bits/mathdef.h index c58167ce83..9477790654 100644 --- a/sysdeps/sparc/fpu/bits/mathdef.h +++ b/sysdeps/sparc/fpu/bits/mathdef.h @@ -25,7 +25,9 @@ /* FIXME! This file describes properties of the compiler, not the machine; it should not be part of libc! */ -#if defined __USE_ISOC99 && defined _MATH_H +#if defined __USE_ISOC99 && defined _MATH_H && !defined _MATH_H_MATHDEF +# define _MATH_H_MATHDEF 1 + # ifdef __GNUC__ # if __STDC__ == 1 diff --git a/sysdeps/unix/sysv/linux/alpha/oldgetrlimit64.c b/sysdeps/unix/sysv/linux/alpha/oldgetrlimit64.c deleted file mode 100644 index 9feab0e6b8..0000000000 --- a/sysdeps/unix/sysv/linux/alpha/oldgetrlimit64.c +++ /dev/null @@ -1 +0,0 @@ -/* getrlimit64 is the same as getrlimit. */ diff --git a/sysdeps/unix/sysv/linux/alpha/oldsetrlimit64.c b/sysdeps/unix/sysv/linux/alpha/oldsetrlimit64.c deleted file mode 100644 index 8edcff0086..0000000000 --- a/sysdeps/unix/sysv/linux/alpha/oldsetrlimit64.c +++ /dev/null @@ -1 +0,0 @@ -/* setrlimit64 is the same as setrlimit. */ diff --git a/sysdeps/unix/sysv/linux/bits/resource.h b/sysdeps/unix/sysv/linux/bits/resource.h index fcff605892..6a3d86ce18 100644 --- a/sysdeps/unix/sysv/linux/bits/resource.h +++ b/sysdeps/unix/sysv/linux/bits/resource.h @@ -106,13 +106,13 @@ enum __rlimit_resource /* Value to indicate that there is no limit. */ #ifndef __USE_FILE_OFFSET64 -# define RLIM_INFINITY ((unsigned long int)(~0UL)) +# define RLIM_INFINITY ((long int)(~0UL >> 1)) #else -# define RLIM_INFINITY 0xffffffffffffffffuLL +# define RLIM_INFINITY 0x7fffffffffffffffLL #endif #ifdef __USE_LARGEFILE64 -# define RLIM64_INFINITY 0xffffffffffffffffuLL +# define RLIM64_INFINITY 0x7fffffffffffffffLL #endif /* We can represent all limits. */ diff --git a/sysdeps/unix/sysv/linux/getrlimit.c b/sysdeps/unix/sysv/linux/getrlimit.c deleted file mode 100644 index 14a879c5df..0000000000 --- a/sysdeps/unix/sysv/linux/getrlimit.c +++ /dev/null @@ -1,84 +0,0 @@ -/* Copyright (C) 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 - 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 -#include - -#include -#include - -#include "kernel-features.h" - -extern int __syscall_ugetrlimit (unsigned int resource, - struct rlimit *rlimits); -extern int __syscall_getrlimit (unsigned int resource, struct rlimit *rlimits); - -/* Linux 2.3.25 introduced a new system call since the types used for - the limits are now unsigned. */ -#if defined __NR_ugetrlimit && !defined __ASSUME_NEW_GETRLIMIT_SYSCALL -int __have_no_new_getrlimit; -#endif - -int -__new_getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits) -{ -#ifdef __ASSUME_NEW_GETRLIMIT_SYSCALL - return INLINE_SYSCALL (ugetrlimit, 2, resource, rlimits); -#else - int result; - -# ifdef __NR_ugetrlimit - if (__have_no_new_getrlimit <= 0) - { - result = INLINE_SYSCALL (ugetrlimit, 2, resource, rlimits); - - /* If the system call is available remember this fact and return. */ - if (result != -1 || errno != ENOSYS) - { - __have_no_new_getrlimit = -1; - return result; - } - - /* Remember that the system call is not available. */ - __have_no_new_getrlimit = 1; - } -# endif - - /* Fall back to the old system call. */ - result = INLINE_SYSCALL (getrlimit, 2, resource, rlimits); - - if (result == -1) - return result; - - /* We might have to correct the limits values. Since the old values - were signed the infinity value is too small. */ - if (rlimits->rlim_cur == RLIM_INFINITY >> 1) - rlimits->rlim_cur = RLIM_INFINITY; - if (rlimits->rlim_max == RLIM_INFINITY >> 1) - rlimits->rlim_max = RLIM_INFINITY; - - return result; -#endif -} - -weak_alias (__new_getrlimit, __getrlimit); -#if defined PIC && DO_VERSIONING -default_symbol_version (__new_getrlimit, getrlimit, GLIBC_2.1.3); -#else -weak_alias (__new_getrlimit, getrlimit); -#endif diff --git a/sysdeps/unix/sysv/linux/getrlimit64.c b/sysdeps/unix/sysv/linux/getrlimit64.c deleted file mode 100644 index 602dd28d8a..0000000000 --- a/sysdeps/unix/sysv/linux/getrlimit64.c +++ /dev/null @@ -1,28 +0,0 @@ -/* Copyright (C) 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 - 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. */ - -#define getrlimit64 __new_getrlimit64 - -#include - -#undef getrlimit64 -#if defined PIC && defined DO_VERSIONING -default_symbol_version (__new_getrlimit64, getrlimit64, GLIBC_2.1.3); -#else -weak_alias (__new_getrlimit64, getrlimit64); -#endif diff --git a/sysdeps/unix/sysv/linux/i386/bits/resource.h b/sysdeps/unix/sysv/linux/i386/bits/resource.h new file mode 100644 index 0000000000..fcff605892 --- /dev/null +++ b/sysdeps/unix/sysv/linux/i386/bits/resource.h @@ -0,0 +1,227 @@ +/* Bit values & structures for resource limits. Linux version. + Copyright (C) 1994, 1996, 1997, 1998, 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 + 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. */ + +#ifndef _SYS_RESOURCE_H +# error "Never use directly; include instead." +#endif + +#include +#include + +/* Transmute defines to enumerations. The macro re-definitions are + necessary because some programs want to test for operating system + features with #ifdef RUSAGE_SELF. In ISO C the reflexive + definition is a no-op. */ + +/* Kinds of resource limit. */ +enum __rlimit_resource +{ + /* Per-process CPU limit, in seconds. */ + _RLIMIT_CPU = RLIMIT_CPU, +#undef RLIMIT_CPU + RLIMIT_CPU = _RLIMIT_CPU, +#define RLIMIT_CPU RLIMIT_CPU + + /* Largest file that can be created, in bytes. */ + _RLIMIT_FSIZE = RLIMIT_FSIZE, +#undef RLIMIT_FSIZE + RLIMIT_FSIZE = _RLIMIT_FSIZE, +#define RLIMIT_FSIZE RLIMIT_FSIZE + + /* Maximum size of data segment, in bytes. */ + _RLIMIT_DATA = RLIMIT_DATA, +#undef RLIMIT_DATA + RLIMIT_DATA = _RLIMIT_DATA, +#define RLIMIT_DATA RLIMIT_DATA + + /* Maximum size of stack segment, in bytes. */ + _RLIMIT_STACK = RLIMIT_STACK, +#undef RLIMIT_STACK + RLIMIT_STACK = _RLIMIT_STACK, +#define RLIMIT_STACK RLIMIT_STACK + + /* Largest core file that can be created, in bytes. */ + _RLIMIT_CORE = RLIMIT_CORE, +#undef RLIMIT_CORE + RLIMIT_CORE = _RLIMIT_CORE, +#define RLIMIT_CORE RLIMIT_CORE + + /* Largest resident set size, in bytes. + This affects swapping; processes that are exceeding their + resident set size will be more likely to have physical memory + taken from them. */ + _RLIMIT_RSS = RLIMIT_RSS, +#undef RLIMIT_RSS + RLIMIT_RSS = _RLIMIT_RSS, +#define RLIMIT_RSS RLIMIT_RSS + + /* Number of open files. */ + _RLIMIT_NOFILE = RLIMIT_NOFILE, +#undef RLIMIT_NOFILE + RLIMIT_NOFILE = _RLIMIT_NOFILE, + RLIMIT_OFILE = RLIMIT_NOFILE, /* BSD name for same. */ +#define RLIMIT_NOFILE RLIMIT_NOFILE +#define RLIMIT_OFILE RLIMIT_OFILE + + /* Address space limit (?) */ + _RLIMIT_AS = RLIMIT_AS, +#undef RLIMIT_AS + RLIMIT_AS = _RLIMIT_AS, +#define RLIMIT_AS RLIMIT_AS + + /* Number of processes. */ + _RLIMIT_NPROC = RLIMIT_NPROC, +#undef RLIMIT_NPROC + RLIMIT_NPROC = _RLIMIT_NPROC, +#define RLIMIT_NPROC RLIMIT_NPROC + + /* Locked-in-memory address space. */ + _RLIMIT_MEMLOCK = RLIMIT_MEMLOCK, +#undef RLIMIT_MEMLOCK + RLIMIT_MEMLOCK = _RLIMIT_MEMLOCK, +#define RLIMIT_MEMLOCK RLIMIT_MEMLOCK + + RLIMIT_NLIMITS = RLIM_NLIMITS, +#undef RLIM_NLIMITS + RLIM_NLIMITS = RLIMIT_NLIMITS +#define RLIMIT_NLIMITS RLIMIT_NLIMITS +#define RLIM_NLIMITS RLIM_NLIMITS +}; + +/* Value to indicate that there is no limit. */ +#ifndef __USE_FILE_OFFSET64 +# define RLIM_INFINITY ((unsigned long int)(~0UL)) +#else +# define RLIM_INFINITY 0xffffffffffffffffuLL +#endif + +#ifdef __USE_LARGEFILE64 +# define RLIM64_INFINITY 0xffffffffffffffffuLL +#endif + +/* We can represent all limits. */ +#define RLIM_SAVED_MAX RLIM_INFINITY +#define RLIM_SAVED_CUR RLIM_INFINITY + + +/* Type for resource quantity measurement. */ +#ifndef __USE_FILE_OFFSET64 +typedef __rlim_t rlim_t; +#else +typedef __rlim64_t rlim_t; +#endif +#ifdef __USE_LARGEFILE64 +typedef __rlim64_t rlim64_t; +#endif + +struct rlimit + { + /* The current (soft) limit. */ + rlim_t rlim_cur; + /* The hard limit. */ + rlim_t rlim_max; + }; + +#ifdef __USE_LARGEFILE64 +struct rlimit64 + { + /* The current (soft) limit. */ + rlim64_t rlim_cur; + /* The hard limit. */ + rlim64_t rlim_max; + }; +#endif + +/* Whose usage statistics do you want? */ +enum __rusage_who +{ + /* The calling process. */ + RUSAGE_SELF = 0, +#define RUSAGE_SELF RUSAGE_SELF + + /* All of its terminated child processes. */ + RUSAGE_CHILDREN = -1, +#define RUSAGE_CHILDREN RUSAGE_CHILDREN + + /* Both. */ + RUSAGE_BOTH = -2 +#define RUSAGE_BOTH RUSAGE_BOTH +}; + +#define __need_timeval +#include /* For `struct timeval'. */ + +/* Structure which says how much of each resource has been used. */ +struct rusage + { + /* Total amount of user time used. */ + struct timeval ru_utime; + /* Total amount of system time used. */ + struct timeval ru_stime; + /* Maximum resident set size (in kilobytes). */ + long int ru_maxrss; + /* Amount of sharing of text segment memory + with other processes (kilobyte-seconds). */ + long int ru_ixrss; + /* Amount of data segment memory used (kilobyte-seconds). */ + long int ru_idrss; + /* Amount of stack memory used (kilobyte-seconds). */ + long int ru_isrss; + /* Number of soft page faults (i.e. those serviced by reclaiming + a page from the list of pages awaiting reallocation. */ + long int ru_minflt; + /* Number of hard page faults (i.e. those that required I/O). */ + long int ru_majflt; + /* Number of times a process was swapped out of physical memory. */ + long int ru_nswap; + /* Number of input operations via the file system. Note: This + and `ru_oublock' do not include operations with the cache. */ + long int ru_inblock; + /* Number of output operations via the file system. */ + long int ru_oublock; + /* Number of IPC messages sent. */ + long int ru_msgsnd; + /* Number of IPC messages received. */ + long int ru_msgrcv; + /* Number of signals delivered. */ + long int ru_nsignals; + /* Number of voluntary context switches, i.e. because the process + gave up the process before it had to (usually to wait for some + resource to be available). */ + long int ru_nvcsw; + /* Number of involuntary context switches, i.e. a higher priority process + became runnable or the current process used up its time slice. */ + long int ru_nivcsw; + }; + +/* Priority limits. */ +#define PRIO_MIN -20 /* Minimum priority a process can have. */ +#define PRIO_MAX 20 /* Maximum priority a process can have. */ + +/* The type of the WHICH argument to `getpriority' and `setpriority', + indicating what flavor of entity the WHO argument specifies. */ +enum __priority_which +{ + PRIO_PROCESS = 0, /* WHO is a process ID. */ +#define PRIO_PROCESS PRIO_PROCESS + PRIO_PGRP = 1, /* WHO is a process group ID. */ +#define PRIO_PGRP PRIO_PGRP + PRIO_USER = 2 /* WHO is a user ID. */ +#define PRIO_USER PRIO_USER +}; diff --git a/sysdeps/unix/sysv/linux/i386/getrlimit.c b/sysdeps/unix/sysv/linux/i386/getrlimit.c new file mode 100644 index 0000000000..14a879c5df --- /dev/null +++ b/sysdeps/unix/sysv/linux/i386/getrlimit.c @@ -0,0 +1,84 @@ +/* Copyright (C) 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 + 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 +#include + +#include +#include + +#include "kernel-features.h" + +extern int __syscall_ugetrlimit (unsigned int resource, + struct rlimit *rlimits); +extern int __syscall_getrlimit (unsigned int resource, struct rlimit *rlimits); + +/* Linux 2.3.25 introduced a new system call since the types used for + the limits are now unsigned. */ +#if defined __NR_ugetrlimit && !defined __ASSUME_NEW_GETRLIMIT_SYSCALL +int __have_no_new_getrlimit; +#endif + +int +__new_getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits) +{ +#ifdef __ASSUME_NEW_GETRLIMIT_SYSCALL + return INLINE_SYSCALL (ugetrlimit, 2, resource, rlimits); +#else + int result; + +# ifdef __NR_ugetrlimit + if (__have_no_new_getrlimit <= 0) + { + result = INLINE_SYSCALL (ugetrlimit, 2, resource, rlimits); + + /* If the system call is available remember this fact and return. */ + if (result != -1 || errno != ENOSYS) + { + __have_no_new_getrlimit = -1; + return result; + } + + /* Remember that the system call is not available. */ + __have_no_new_getrlimit = 1; + } +# endif + + /* Fall back to the old system call. */ + result = INLINE_SYSCALL (getrlimit, 2, resource, rlimits); + + if (result == -1) + return result; + + /* We might have to correct the limits values. Since the old values + were signed the infinity value is too small. */ + if (rlimits->rlim_cur == RLIM_INFINITY >> 1) + rlimits->rlim_cur = RLIM_INFINITY; + if (rlimits->rlim_max == RLIM_INFINITY >> 1) + rlimits->rlim_max = RLIM_INFINITY; + + return result; +#endif +} + +weak_alias (__new_getrlimit, __getrlimit); +#if defined PIC && DO_VERSIONING +default_symbol_version (__new_getrlimit, getrlimit, GLIBC_2.1.3); +#else +weak_alias (__new_getrlimit, getrlimit); +#endif diff --git a/sysdeps/unix/sysv/linux/i386/getrlimit64.c b/sysdeps/unix/sysv/linux/i386/getrlimit64.c new file mode 100644 index 0000000000..602dd28d8a --- /dev/null +++ b/sysdeps/unix/sysv/linux/i386/getrlimit64.c @@ -0,0 +1,28 @@ +/* Copyright (C) 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 + 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. */ + +#define getrlimit64 __new_getrlimit64 + +#include + +#undef getrlimit64 +#if defined PIC && defined DO_VERSIONING +default_symbol_version (__new_getrlimit64, getrlimit64, GLIBC_2.1.3); +#else +weak_alias (__new_getrlimit64, getrlimit64); +#endif diff --git a/sysdeps/unix/sysv/linux/i386/oldgetrlimit64.c b/sysdeps/unix/sysv/linux/i386/oldgetrlimit64.c new file mode 100644 index 0000000000..5fb0becfbe --- /dev/null +++ b/sysdeps/unix/sysv/linux/i386/oldgetrlimit64.c @@ -0,0 +1,53 @@ +/* Copyright (C) 1991, 1995, 1996, 1997, 1998, 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 + 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. */ + +/* This is a compatibility file. If we don't build the libc with + versioning don't compile this file. */ +#if defined PIC && DO_VERSIONING + +#include +#include +#include + +extern int __old_getrlimit (enum __rlimit_resource, struct rlimit *); + +/* Put the soft and hard limits for RESOURCE in *RLIMITS. + Returns 0 if successful, -1 if not (and sets errno). */ +int +__old_getrlimit64 (enum __rlimit_resource resource, struct rlimit64 *rlimits) +{ + struct rlimit rlimits32; + + if (__old_getrlimit (resource, &rlimits32) < 0) + return -1; + + if (rlimits32.rlim_cur == RLIM_INFINITY >> 1) + rlimits->rlim_cur = RLIM64_INFINITY >> 1; + else + rlimits->rlim_cur = rlimits32.rlim_cur; + if (rlimits32.rlim_max == RLIM_INFINITY >> 1) + rlimits->rlim_max = RLIM64_INFINITY >> 1; + else + rlimits->rlim_max = rlimits32.rlim_max; + + return 0; +} + +symbol_version (__old_getrlimit64, getrlimit64, GLIBC_2.1); + +#endif /* PIC && DO_VERSIONING */ diff --git a/sysdeps/unix/sysv/linux/i386/oldsetrlimit64.c b/sysdeps/unix/sysv/linux/i386/oldsetrlimit64.c new file mode 100644 index 0000000000..c5448dcdce --- /dev/null +++ b/sysdeps/unix/sysv/linux/i386/oldsetrlimit64.c @@ -0,0 +1,52 @@ +/* Copyright (C) 1991, 95, 96, 97, 98, 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 + 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. */ + +/* This is a compatibility file. If we don't build the libc with + versioning don't compile this file. */ +#if defined PIC && DO_VERSIONING + +#include +#include +#include + +extern int __old_setrlimit (enum __rlimit_resource, const struct rlimit *); + +/* Set the soft and hard limits for RESOURCE to *RLIMITS. + Only the super-user can increase hard limits. + Return 0 if successful, -1 if not (and sets errno). */ +int +__old_setrlimit64 (enum __rlimit_resource resource, + const struct rlimit64 *rlimits) +{ + struct rlimit rlimits32; + + if (rlimits->rlim_cur >= RLIM_INFINITY >> 1) + rlimits32.rlim_cur = RLIM_INFINITY >> 1; + else + rlimits32.rlim_cur = rlimits->rlim_cur; + if (rlimits->rlim_max >= RLIM_INFINITY >> 1) + rlimits32.rlim_max = RLIM_INFINITY >> 1; + else + rlimits32.rlim_max = rlimits->rlim_max; + + return __old_setrlimit (resource, &rlimits32); +} + +symbol_version (__old_setrlimit64, setrlimit64, GLIBC_2.1); + +#endif /* PIC && DO_VERSIONING */ diff --git a/sysdeps/unix/sysv/linux/i386/setrlimit.c b/sysdeps/unix/sysv/linux/i386/setrlimit.c new file mode 100644 index 0000000000..2123360fc9 --- /dev/null +++ b/sysdeps/unix/sysv/linux/i386/setrlimit.c @@ -0,0 +1,82 @@ +/* Copyright (C) 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 + 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 +#include +#include + +#include +#include + +#include "kernel-features.h" + +extern int __syscall_setrlimit (unsigned int resource, + const struct rlimit *rlimits); +extern int __syscall_ugetrlimit (unsigned int resource, + const struct rlimit *rlimits); + +/* Linux 2.3.25 introduced a new system call since the types used for + the limits are now unsigned. */ +#if defined __NR_ugetrlimit && !defined __ASSUME_NEW_GETRLIMIT_SYSCALL +extern int __have_no_new_getrlimit; /* from getrlimit.c */ +#endif + +int +__new_setrlimit (enum __rlimit_resource resource, const struct rlimit *rlimits) +{ +#ifdef __ASSUME_NEW_GETRLIMIT_SYSCALL + return INLINE_SYSCALL (setrlimit, 2, resource, rlimits); +#else + struct rlimit rlimits_small; + +# ifdef __NR_ugetrlimit + if (__have_no_new_getrlimit == 0) + { + /* Check if the new ugetrlimit syscall exists. We must do this + first because older kernels don't reject negative rlimit + values in setrlimit. */ + result = INLINE_SYSCALL (ugetrlimit, 2, resource, &rlimits_small); + if (result != -1 || errno != ENOSYS) + /* The syscall exists. */ + __have_no_new_getrlimit = -1; + else + /* The syscall does not exist. */ + __have_no_new_getrlimit = 1; + } + if (__have_no_new_getrlimit < 0) + return INLINE_SYSCALL (setrlimit, 2, resource, rlimits); +# endif + + /* We might have to correct the limits values. Since the old values + were signed the new values might be too large. */ + rlimits_small.rlim_cur = MIN ((unsigned long int) rlimits->rlim_cur, + RLIM_INFINITY >> 1); + rlimits_small.rlim_max = MIN ((unsigned long int) rlimits->rlim_max, + RLIM_INFINITY >> 1); + + /* Use the adjusted values. */ + return INLINE_SYSCALL (setrlimit, 2, resource, &rlimits_small); +#endif +} + +weak_alias (__new_setrlimit, __setrlimit); +#if defined PIC && DO_VERSIONING +default_symbol_version (__new_setrlimit, setrlimit, GLIBC_2.1.3); +#else +weak_alias (__new_setrlimit, setrlimit); +#endif diff --git a/sysdeps/unix/sysv/linux/i386/setrlimit64.c b/sysdeps/unix/sysv/linux/i386/setrlimit64.c new file mode 100644 index 0000000000..3e7e5cc0e0 --- /dev/null +++ b/sysdeps/unix/sysv/linux/i386/setrlimit64.c @@ -0,0 +1,28 @@ +/* Copyright (C) 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 + 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. */ + +#define setrlimit64 __new_setrlimit64 + +#include + +#undef setrlimit64 +#if defined PIC && defined DO_VERSIONING +default_symbol_version (__new_setrlimit64, setrlimit64, GLIBC_2.1.3); +#else +weak_alias (__new_setrlimit64, setrlimit64); +#endif diff --git a/sysdeps/unix/sysv/linux/oldgetrlimit64.c b/sysdeps/unix/sysv/linux/oldgetrlimit64.c deleted file mode 100644 index 5fb0becfbe..0000000000 --- a/sysdeps/unix/sysv/linux/oldgetrlimit64.c +++ /dev/null @@ -1,53 +0,0 @@ -/* Copyright (C) 1991, 1995, 1996, 1997, 1998, 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 - 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. */ - -/* This is a compatibility file. If we don't build the libc with - versioning don't compile this file. */ -#if defined PIC && DO_VERSIONING - -#include -#include -#include - -extern int __old_getrlimit (enum __rlimit_resource, struct rlimit *); - -/* Put the soft and hard limits for RESOURCE in *RLIMITS. - Returns 0 if successful, -1 if not (and sets errno). */ -int -__old_getrlimit64 (enum __rlimit_resource resource, struct rlimit64 *rlimits) -{ - struct rlimit rlimits32; - - if (__old_getrlimit (resource, &rlimits32) < 0) - return -1; - - if (rlimits32.rlim_cur == RLIM_INFINITY >> 1) - rlimits->rlim_cur = RLIM64_INFINITY >> 1; - else - rlimits->rlim_cur = rlimits32.rlim_cur; - if (rlimits32.rlim_max == RLIM_INFINITY >> 1) - rlimits->rlim_max = RLIM64_INFINITY >> 1; - else - rlimits->rlim_max = rlimits32.rlim_max; - - return 0; -} - -symbol_version (__old_getrlimit64, getrlimit64, GLIBC_2.1); - -#endif /* PIC && DO_VERSIONING */ diff --git a/sysdeps/unix/sysv/linux/oldsetrlimit64.c b/sysdeps/unix/sysv/linux/oldsetrlimit64.c deleted file mode 100644 index c5448dcdce..0000000000 --- a/sysdeps/unix/sysv/linux/oldsetrlimit64.c +++ /dev/null @@ -1,52 +0,0 @@ -/* Copyright (C) 1991, 95, 96, 97, 98, 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 - 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. */ - -/* This is a compatibility file. If we don't build the libc with - versioning don't compile this file. */ -#if defined PIC && DO_VERSIONING - -#include -#include -#include - -extern int __old_setrlimit (enum __rlimit_resource, const struct rlimit *); - -/* Set the soft and hard limits for RESOURCE to *RLIMITS. - Only the super-user can increase hard limits. - Return 0 if successful, -1 if not (and sets errno). */ -int -__old_setrlimit64 (enum __rlimit_resource resource, - const struct rlimit64 *rlimits) -{ - struct rlimit rlimits32; - - if (rlimits->rlim_cur >= RLIM_INFINITY >> 1) - rlimits32.rlim_cur = RLIM_INFINITY >> 1; - else - rlimits32.rlim_cur = rlimits->rlim_cur; - if (rlimits->rlim_max >= RLIM_INFINITY >> 1) - rlimits32.rlim_max = RLIM_INFINITY >> 1; - else - rlimits32.rlim_max = rlimits->rlim_max; - - return __old_setrlimit (resource, &rlimits32); -} - -symbol_version (__old_setrlimit64, setrlimit64, GLIBC_2.1); - -#endif /* PIC && DO_VERSIONING */ diff --git a/sysdeps/unix/sysv/linux/setrlimit.c b/sysdeps/unix/sysv/linux/setrlimit.c deleted file mode 100644 index 2123360fc9..0000000000 --- a/sysdeps/unix/sysv/linux/setrlimit.c +++ /dev/null @@ -1,82 +0,0 @@ -/* Copyright (C) 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 - 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 -#include -#include - -#include -#include - -#include "kernel-features.h" - -extern int __syscall_setrlimit (unsigned int resource, - const struct rlimit *rlimits); -extern int __syscall_ugetrlimit (unsigned int resource, - const struct rlimit *rlimits); - -/* Linux 2.3.25 introduced a new system call since the types used for - the limits are now unsigned. */ -#if defined __NR_ugetrlimit && !defined __ASSUME_NEW_GETRLIMIT_SYSCALL -extern int __have_no_new_getrlimit; /* from getrlimit.c */ -#endif - -int -__new_setrlimit (enum __rlimit_resource resource, const struct rlimit *rlimits) -{ -#ifdef __ASSUME_NEW_GETRLIMIT_SYSCALL - return INLINE_SYSCALL (setrlimit, 2, resource, rlimits); -#else - struct rlimit rlimits_small; - -# ifdef __NR_ugetrlimit - if (__have_no_new_getrlimit == 0) - { - /* Check if the new ugetrlimit syscall exists. We must do this - first because older kernels don't reject negative rlimit - values in setrlimit. */ - result = INLINE_SYSCALL (ugetrlimit, 2, resource, &rlimits_small); - if (result != -1 || errno != ENOSYS) - /* The syscall exists. */ - __have_no_new_getrlimit = -1; - else - /* The syscall does not exist. */ - __have_no_new_getrlimit = 1; - } - if (__have_no_new_getrlimit < 0) - return INLINE_SYSCALL (setrlimit, 2, resource, rlimits); -# endif - - /* We might have to correct the limits values. Since the old values - were signed the new values might be too large. */ - rlimits_small.rlim_cur = MIN ((unsigned long int) rlimits->rlim_cur, - RLIM_INFINITY >> 1); - rlimits_small.rlim_max = MIN ((unsigned long int) rlimits->rlim_max, - RLIM_INFINITY >> 1); - - /* Use the adjusted values. */ - return INLINE_SYSCALL (setrlimit, 2, resource, &rlimits_small); -#endif -} - -weak_alias (__new_setrlimit, __setrlimit); -#if defined PIC && DO_VERSIONING -default_symbol_version (__new_setrlimit, setrlimit, GLIBC_2.1.3); -#else -weak_alias (__new_setrlimit, setrlimit); -#endif diff --git a/sysdeps/unix/sysv/linux/setrlimit64.c b/sysdeps/unix/sysv/linux/setrlimit64.c deleted file mode 100644 index 3e7e5cc0e0..0000000000 --- a/sysdeps/unix/sysv/linux/setrlimit64.c +++ /dev/null @@ -1,28 +0,0 @@ -/* Copyright (C) 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 - 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. */ - -#define setrlimit64 __new_setrlimit64 - -#include - -#undef setrlimit64 -#if defined PIC && defined DO_VERSIONING -default_symbol_version (__new_setrlimit64, setrlimit64, GLIBC_2.1.3); -#else -weak_alias (__new_setrlimit64, setrlimit64); -#endif diff --git a/sysdeps/unix/sysv/linux/sparc/bits/resource.h b/sysdeps/unix/sysv/linux/sparc/bits/resource.h new file mode 100644 index 0000000000..abfe433c59 --- /dev/null +++ b/sysdeps/unix/sysv/linux/sparc/bits/resource.h @@ -0,0 +1,243 @@ +/* Bit values & structures for resource limits. Linux version. + Copyright (C) 1994, 1996, 1997, 1998, 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 + 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. */ + +#ifndef _SYS_RESOURCE_H +# error "Never use directly; include instead." +#endif + +#include +#include + +/* Transmute defines to enumerations. The macro re-definitions are + necessary because some programs want to test for operating system + features with #ifdef RUSAGE_SELF. In ISO C the reflexive + definition is a no-op. */ + +/* Kinds of resource limit. */ +enum __rlimit_resource +{ + /* Per-process CPU limit, in seconds. */ + _RLIMIT_CPU = RLIMIT_CPU, +#undef RLIMIT_CPU + RLIMIT_CPU = _RLIMIT_CPU, +#define RLIMIT_CPU RLIMIT_CPU + + /* Largest file that can be created, in bytes. */ + _RLIMIT_FSIZE = RLIMIT_FSIZE, +#undef RLIMIT_FSIZE + RLIMIT_FSIZE = _RLIMIT_FSIZE, +#define RLIMIT_FSIZE RLIMIT_FSIZE + + /* Maximum size of data segment, in bytes. */ + _RLIMIT_DATA = RLIMIT_DATA, +#undef RLIMIT_DATA + RLIMIT_DATA = _RLIMIT_DATA, +#define RLIMIT_DATA RLIMIT_DATA + + /* Maximum size of stack segment, in bytes. */ + _RLIMIT_STACK = RLIMIT_STACK, +#undef RLIMIT_STACK + RLIMIT_STACK = _RLIMIT_STACK, +#define RLIMIT_STACK RLIMIT_STACK + + /* Largest core file that can be created, in bytes. */ + _RLIMIT_CORE = RLIMIT_CORE, +#undef RLIMIT_CORE + RLIMIT_CORE = _RLIMIT_CORE, +#define RLIMIT_CORE RLIMIT_CORE + + /* Largest resident set size, in bytes. + This affects swapping; processes that are exceeding their + resident set size will be more likely to have physical memory + taken from them. */ + _RLIMIT_RSS = RLIMIT_RSS, +#undef RLIMIT_RSS + RLIMIT_RSS = _RLIMIT_RSS, +#define RLIMIT_RSS RLIMIT_RSS + + /* Number of open files. */ + _RLIMIT_NOFILE = RLIMIT_NOFILE, +#undef RLIMIT_NOFILE + RLIMIT_NOFILE = _RLIMIT_NOFILE, + RLIMIT_OFILE = RLIMIT_NOFILE, /* BSD name for same. */ +#define RLIMIT_NOFILE RLIMIT_NOFILE +#define RLIMIT_OFILE RLIMIT_OFILE + + /* Address space limit (?) */ + _RLIMIT_AS = RLIMIT_AS, +#undef RLIMIT_AS + RLIMIT_AS = _RLIMIT_AS, +#define RLIMIT_AS RLIMIT_AS + + /* Number of processes. */ + _RLIMIT_NPROC = RLIMIT_NPROC, +#undef RLIMIT_NPROC + RLIMIT_NPROC = _RLIMIT_NPROC, +#define RLIMIT_NPROC RLIMIT_NPROC + + /* Locked-in-memory address space. */ + _RLIMIT_MEMLOCK = RLIMIT_MEMLOCK, +#undef RLIMIT_MEMLOCK + RLIMIT_MEMLOCK = _RLIMIT_MEMLOCK, +#define RLIMIT_MEMLOCK RLIMIT_MEMLOCK + + RLIMIT_NLIMITS = RLIM_NLIMITS, +#undef RLIM_NLIMITS + RLIM_NLIMITS = RLIMIT_NLIMITS +#define RLIMIT_NLIMITS RLIMIT_NLIMITS +#define RLIM_NLIMITS RLIM_NLIMITS +}; + +/* Value to indicate that there is no limit. */ +#if __WORDSIZE == 64 + +#ifndef __USE_FILE_OFFSET64 +# define RLIM_INFINITY ((unsigned long int)(~0UL)) +#else +# define RLIM_INFINITY 0xffffffffffffffffuLL +#endif + +#ifdef __USE_LARGEFILE64 +# define RLIM64_INFINITY 0xffffffffffffffffuLL +#endif + +#else + +#ifndef __USE_FILE_OFFSET64 +# define RLIM_INFINITY ((long int)(~0UL >> 1)) +#else +# define RLIM_INFINITY 0x7fffffffffffffffLL +#endif + +#ifdef __USE_LARGEFILE64 +# define RLIM64_INFINITY 0x7fffffffffffffffLL +#endif + +#endif + +/* We can represent all limits. */ +#define RLIM_SAVED_MAX RLIM_INFINITY +#define RLIM_SAVED_CUR RLIM_INFINITY + + +/* Type for resource quantity measurement. */ +#ifndef __USE_FILE_OFFSET64 +typedef __rlim_t rlim_t; +#else +typedef __rlim64_t rlim_t; +#endif +#ifdef __USE_LARGEFILE64 +typedef __rlim64_t rlim64_t; +#endif + +struct rlimit + { + /* The current (soft) limit. */ + rlim_t rlim_cur; + /* The hard limit. */ + rlim_t rlim_max; + }; + +#ifdef __USE_LARGEFILE64 +struct rlimit64 + { + /* The current (soft) limit. */ + rlim64_t rlim_cur; + /* The hard limit. */ + rlim64_t rlim_max; + }; +#endif + +/* Whose usage statistics do you want? */ +enum __rusage_who +{ + /* The calling process. */ + RUSAGE_SELF = 0, +#define RUSAGE_SELF RUSAGE_SELF + + /* All of its terminated child processes. */ + RUSAGE_CHILDREN = -1, +#define RUSAGE_CHILDREN RUSAGE_CHILDREN + + /* Both. */ + RUSAGE_BOTH = -2 +#define RUSAGE_BOTH RUSAGE_BOTH +}; + +#define __need_timeval +#include /* For `struct timeval'. */ + +/* Structure which says how much of each resource has been used. */ +struct rusage + { + /* Total amount of user time used. */ + struct timeval ru_utime; + /* Total amount of system time used. */ + struct timeval ru_stime; + /* Maximum resident set size (in kilobytes). */ + long int ru_maxrss; + /* Amount of sharing of text segment memory + with other processes (kilobyte-seconds). */ + long int ru_ixrss; + /* Amount of data segment memory used (kilobyte-seconds). */ + long int ru_idrss; + /* Amount of stack memory used (kilobyte-seconds). */ + long int ru_isrss; + /* Number of soft page faults (i.e. those serviced by reclaiming + a page from the list of pages awaiting reallocation. */ + long int ru_minflt; + /* Number of hard page faults (i.e. those that required I/O). */ + long int ru_majflt; + /* Number of times a process was swapped out of physical memory. */ + long int ru_nswap; + /* Number of input operations via the file system. Note: This + and `ru_oublock' do not include operations with the cache. */ + long int ru_inblock; + /* Number of output operations via the file system. */ + long int ru_oublock; + /* Number of IPC messages sent. */ + long int ru_msgsnd; + /* Number of IPC messages received. */ + long int ru_msgrcv; + /* Number of signals delivered. */ + long int ru_nsignals; + /* Number of voluntary context switches, i.e. because the process + gave up the process before it had to (usually to wait for some + resource to be available). */ + long int ru_nvcsw; + /* Number of involuntary context switches, i.e. a higher priority process + became runnable or the current process used up its time slice. */ + long int ru_nivcsw; + }; + +/* Priority limits. */ +#define PRIO_MIN -20 /* Minimum priority a process can have. */ +#define PRIO_MAX 20 /* Maximum priority a process can have. */ + +/* The type of the WHICH argument to `getpriority' and `setpriority', + indicating what flavor of entity the WHO argument specifies. */ +enum __priority_which +{ + PRIO_PROCESS = 0, /* WHO is a process ID. */ +#define PRIO_PROCESS PRIO_PROCESS + PRIO_PGRP = 1, /* WHO is a process group ID. */ +#define PRIO_PGRP PRIO_PGRP + PRIO_USER = 2 /* WHO is a user ID. */ +#define PRIO_USER PRIO_USER +}; diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/oldgetrlimit64.c b/sysdeps/unix/sysv/linux/sparc/sparc64/oldgetrlimit64.c deleted file mode 100644 index 9feab0e6b8..0000000000 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/oldgetrlimit64.c +++ /dev/null @@ -1 +0,0 @@ -/* getrlimit64 is the same as getrlimit. */ diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/oldsetrlimit64.c b/sysdeps/unix/sysv/linux/sparc/sparc64/oldsetrlimit64.c deleted file mode 100644 index 8edcff0086..0000000000 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/oldsetrlimit64.c +++ /dev/null @@ -1 +0,0 @@ -/* setrlimit64 is the same as setrlimit. */ diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/sigaction.c b/sysdeps/unix/sysv/linux/sparc/sparc64/sigaction.c index cbfc248c8e..34d3c62e86 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/sigaction.c +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/sigaction.c @@ -44,6 +44,7 @@ __sigaction (int sig, __const struct sigaction *act, struct sigaction *oact) { kact.k_sa_handler = act->sa_handler; memcpy (&kact.sa_mask, &act->sa_mask, sizeof (sigset_t)); + kact.sa_flags = act->sa_flags; kact.sa_restorer = NULL; } -- cgit 1.4.1