lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00
Code Activity

Remove __ASSUME_NEW_GETRLIMIT_SYSCALL.

Browse Source
This commit is contained in:
Joseph Myers
2012-05-25 22:30:06 +00:00
parent 918b56067a
commit a82392228a
4 changed files with 17 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ChangeLog
View File

@ -1,3 +1,16 @@
2012-05-25 Joseph Myers <joseph@codesourcery.com>
* sysdeps/unix/sysv/linux/kernel-features.h
(__ASSUME_NEW_GETRLIMIT_SYSCALL): Remove all definitions.
* sysdeps/unix/sysv/linux/i386/getrlimit.c: Do not include
kernel-features.h.
[!__ASSUME_NEW_GETRLIMIT_SYSCALL]: Remove conditional code.
[__ASSUME_NEW_GETRLIMIT_SYSCALL]: Make code unconditional.
* sysdeps/unix/sysv/linux/i386/setrlimit.c Do not include
kernel-features.h.
[!__ASSUME_NEW_GETRLIMIT_SYSCALL]: Remove conditional code.
[__ASSUME_NEW_GETRLIMIT_SYSCALL]: Make code unconditional.
2012-05-25 H.J. Lu <hongjiu.lu@intel.com> 2012-05-25 H.J. Lu <hongjiu.lu@intel.com>
* configure.in: Define the default includes to being none. * configure.in: Define the default includes to being none.

47
sysdeps/unix/sysv/linux/i386/getrlimit.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1999, 2000, 2003, 2006 Free Software Foundation, Inc. /* Copyright (C) 1999-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -23,58 +23,15 @@
#include <shlib-compat.h> #include <shlib-compat.h>
#include <bp-checks.h> #include <bp-checks.h>
#include <kernel-features.h>
extern int __new_getrlimit (enum __rlimit_resource resource, extern int __new_getrlimit (enum __rlimit_resource resource,
struct rlimit *__unbounded rlimits); struct rlimit *__unbounded rlimits);
/* Consider moving to syscalls.list. */
/* 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 int
__new_getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits) __new_getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits)
{ {
#ifdef __ASSUME_NEW_GETRLIMIT_SYSCALL
return INLINE_SYSCALL (ugetrlimit, 2, resource, CHECK_1 (rlimits)); return INLINE_SYSCALL (ugetrlimit, 2, resource, CHECK_1 (rlimits));
#else
int result;
# ifdef __NR_ugetrlimit
if (__have_no_new_getrlimit <= 0)
{
result = INLINE_SYSCALL (ugetrlimit, 2, resource, CHECK_1 (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, CHECK_1 (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); weak_alias (__new_getrlimit, __getrlimit);

42
sysdeps/unix/sysv/linux/i386/setrlimit.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1999, 2000, 2003, 2006 Free Software Foundation, Inc. /* Copyright (C) 1999-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -24,53 +24,15 @@
#include <shlib-compat.h> #include <shlib-compat.h>
#include <bp-checks.h> #include <bp-checks.h>
#include <kernel-features.h>
extern int __new_setrlimit (enum __rlimit_resource resource, extern int __new_setrlimit (enum __rlimit_resource resource,
const struct rlimit *__unboundedrlimits); const struct rlimit *__unboundedrlimits);
/* Linux 2.3.25 introduced a new system call since the types used for /* Consider moving to syscalls.list. */
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 int
__new_setrlimit (enum __rlimit_resource resource, const struct rlimit *rlimits) __new_setrlimit (enum __rlimit_resource resource, const struct rlimit *rlimits)
{ {
#ifdef __ASSUME_NEW_GETRLIMIT_SYSCALL
return INLINE_SYSCALL (setrlimit, 2, resource, CHECK_1 (rlimits)); return INLINE_SYSCALL (setrlimit, 2, resource, CHECK_1 (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. */
int result = INLINE_SYSCALL (ugetrlimit, 2, resource, __ptrvalue (&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, CHECK_1 (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, __ptrvalue (&rlimits_small));
#endif
} }
weak_alias (__new_setrlimit, __setrlimit); weak_alias (__new_setrlimit, __setrlimit);

10
sysdeps/unix/sysv/linux/kernel-features.h
View File

@ -40,11 +40,6 @@
/* The sendfile syscall was introduced in 2.2.0. */ /* The sendfile syscall was introduced in 2.2.0. */
#define __ASSUME_SENDFILE 1 #define __ASSUME_SENDFILE 1
/* On x86 another `getrlimit' syscall was added in 2.3.25. */
#ifdef __i386__
# define __ASSUME_NEW_GETRLIMIT_SYSCALL 1
#endif
/* On x86 the truncate64/ftruncate64 syscalls were introduced in 2.3.31. */ /* On x86 the truncate64/ftruncate64 syscalls were introduced in 2.3.31. */
#ifdef __i386__ #ifdef __i386__
# define __ASSUME_TRUNCATE64_SYSCALL 1 # define __ASSUME_TRUNCATE64_SYSCALL 1
@ -68,11 +63,6 @@
# define __ASSUME_STAT64_SYSCALL 1 # define __ASSUME_STAT64_SYSCALL 1
#endif #endif
/* I know for sure that getrlimit are in 2.3.35 on powerpc. */
#ifdef __powerpc__
# define __ASSUME_NEW_GETRLIMIT_SYSCALL 1
#endif
/* I know for sure that these are in 2.3.35 on powerpc. But PowerPC64 does not /* I know for sure that these are in 2.3.35 on powerpc. But PowerPC64 does not
support separate 64-bit syscalls, already 64-bit. */ support separate 64-bit syscalls, already 64-bit. */
#if defined __powerpc__ && !defined __powerpc64__ #if defined __powerpc__ && !defined __powerpc64__