AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-01-03 00:10:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use prlimit64 for 32-bit [gs]etrlimit64 implementation.

Browse Source
This commit is contained in:
Ulrich Drepper 2010-12-25 20:12:27 -05:00
parent 9798346413
commit 5bd6dc5c2c
5 changed files with 121 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,5 +1,11 @@
2010-12-25 Ulrich Drepper <drepper@gmail.com>
[BZ #12201]
* sysdeps/unix/sysv/linux/getrlimit64.c: New file.
* sysdeps/unix/sysv/linux/setrlimit64.c: New file.
* sysdeps/unix/sysv/linux/i386/getrlimit64.c: Use ../getrlimit64.c.
* sysdeps/unix/sysv/linux/kernel-features.h: Define __ASSUME_PRLIMIT64.
[BZ #12207]
* malloc/malloc.c (do_check_malloc_state): Use fastbin macro.

54
sysdeps/unix/sysv/linux/getrlimit64.c Normal file
View File

@ -0,0 +1,54 @@
/* Copyright (C) 2010 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 Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 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
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, write to the Free
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
#include <errno.h>
#include <sys/resource.h>
#include <sys/types.h>
#include <sysdep.h>
#include <kernel-features.h>
/* Put the soft and hard limits for RESOURCE in *RLIMITS.
Returns 0 if successful, -1 if not (and sets errno). */
int
getrlimit64 (enum __rlimit_resource resource, struct rlimit64 *rlimits)
{
#ifdef __ASSUME_PRLIMIT64
return INLINE_SYSCALL (prlimit64, 4, 0, resource, NULL, rlimits);
#else
# ifdef __NR_prlimit64
int res = INLINE_SYSCALL (prlimit64, 4, 0, resource, NULL, rlimits);
if (res == 0 || errno != ENOSYS)
return res;
# endif
struct rlimit rlimits32;
if (__getrlimit (resource, &rlimits32) < 0)
return -1;
if (rlimits32.rlim_cur == RLIM_INFINITY)
rlimits->rlim_cur = RLIM64_INFINITY;
else
rlimits->rlim_cur = rlimits32.rlim_cur;
if (rlimits32.rlim_max == RLIM_INFINITY)
rlimits->rlim_max = RLIM64_INFINITY;
else
rlimits->rlim_max = rlimits32.rlim_max;
return 0;
#endif
}

4
sysdeps/unix/sysv/linux/i386/getrlimit64.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1999, 2000, 2005 Free Software Foundation, Inc.
/* Copyright (C) 1999, 2000, 2005, 2010 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
@ -18,7 +18,7 @@
#define getrlimit64 __new_getrlimit64
#include <resource/getrlimit64.c>
#include "../getrlimit64.c"
#undef getrlimit64
#include <shlib-compat.h>

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

@ -535,3 +535,8 @@
#if __LINUX_KERNEL_VERSION >= 0x020624
# define __ASSUME_STATFS_F_FLAGS 1
#endif
/* prlimit64 is available in 2.6.36. */
#if __LINUX_KERNEL_VERSION >= 0x020624
# define __ASSUME_PRLIMIT64 1
#endif

54
sysdeps/unix/sysv/linux/setrlimit64.c Normal file
View File

@ -0,0 +1,54 @@
/* Copyright (C) 2010 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 Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 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
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, write to the Free
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
#include <errno.h>
#include <sys/resource.h>
#include <sys/types.h>
#include <sysdep.h>
#include <kernel-features.h>
/* 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
setrlimit64 (resource, rlimits)
enum __rlimit_resource resource;
const struct rlimit64 *rlimits;
{
#ifdef __ASSUME_PRLIMIT64
return INLINE_SYSCALL (prlimit64, 4, 0, resource, rlimits, NULL);
#else
# ifdef __NR_prlimit64
int res = INLINE_SYSCALL (prlimit64, 4, 0, resource, rlimits, NULL);
if (res == 0 || errno != ENOSYS)
return res;
# endif
struct rlimit rlimits32;
if (rlimits->rlim_cur >= RLIM_INFINITY)
rlimits32.rlim_cur = RLIM_INFINITY;
else
rlimits32.rlim_cur = rlimits->rlim_cur;
if (rlimits->rlim_max >= RLIM_INFINITY)
rlimits32.rlim_max = RLIM_INFINITY;
else
rlimits32.rlim_max = rlimits->rlim_max;
return __setrlimit (resource, &rlimits32);
#endif
}