[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[commits] r12398 - in /fsf/trunk/libc: ./ malloc/ string/ sysdeps/mach/ sysdeps/unix/sysv/linux/ sysdeps/unix/sysv/linux/i386/
- To: commits@xxxxxxxxxx
- Subject: [commits] r12398 - in /fsf/trunk/libc: ./ malloc/ string/ sysdeps/mach/ sysdeps/unix/sysv/linux/ sysdeps/unix/sysv/linux/i386/
- From: eglibc@xxxxxxxxxx
- Date: Sun, 26 Dec 2010 08:03:14 -0000
Author: eglibc
Date: Sun Dec 26 00:03:09 2010
New Revision: 12398
Log:
Import glibc-mainline for 2010-12-26
Added:
fsf/trunk/libc/sysdeps/unix/sysv/linux/getrlimit64.c
fsf/trunk/libc/sysdeps/unix/sysv/linux/setrlimit64.c
Modified:
fsf/trunk/libc/ChangeLog
fsf/trunk/libc/malloc/malloc.c
fsf/trunk/libc/string/xpg-strerror.c
fsf/trunk/libc/sysdeps/mach/xpg-strerror.c
fsf/trunk/libc/sysdeps/unix/sysv/linux/i386/getrlimit64.c
fsf/trunk/libc/sysdeps/unix/sysv/linux/kernel-features.h
Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Sun Dec 26 00:03:09 2010
@@ -1,3 +1,18 @@
+2010-12-25 Ulrich Drepper <drepper@xxxxxxxxx>
+
+ [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.
+
+ [BZ #12204]
+ * string/xpg-strerror.c (__xpg_strerror_r): Return error code, not -1.
+ * sysdeps/mach/xpg-strerror.c (__xpg_strerror_r): Likewise.
+
2010-12-15 H.J. Lu <hongjiu.lu@xxxxxxxxx>
* config.h.in (NO_CTORS_DTORS_SECTIONS): Define.
Modified: fsf/trunk/libc/malloc/malloc.c
==============================================================================
--- fsf/trunk/libc/malloc/malloc.c (original)
+++ fsf/trunk/libc/malloc/malloc.c Sun Dec 26 00:03:09 2010
@@ -2831,7 +2831,7 @@
max_fast_bin = fastbin_index(get_max_fast ());
for (i = 0; i < NFASTBINS; ++i) {
- p = av->fastbins[i];
+ p = fastbin (av, i);
/* The following test can only be performed for the main arena.
While mallopt calls malloc_consolidate to get rid of all fast
Modified: fsf/trunk/libc/string/xpg-strerror.c
==============================================================================
--- fsf/trunk/libc/string/xpg-strerror.c (original)
+++ fsf/trunk/libc/string/xpg-strerror.c Sun Dec 26 00:03:09 2010
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1993, 1995, 1996, 1997, 1998, 2000, 2002, 2004
+/* Copyright (C) 1991, 1993, 1995, 1996, 1997, 1998, 2000, 2002, 2004, 2010
Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -39,18 +39,13 @@
{
if (errnum < 0 || errnum >= _sys_nerr_internal
|| _sys_errlist_internal[errnum] == NULL)
- {
- __set_errno (EINVAL);
- return -1;
- }
+ return EINVAL;
+
const char *estr = (const char *) _(_sys_errlist_internal[errnum]);
size_t estrlen = strlen (estr) + 1;
if (buflen < estrlen)
- {
- __set_errno (ERANGE);
- return -1;
- }
+ return ERANGE;
memcpy (buf, estr, estrlen);
return 0;
Modified: fsf/trunk/libc/sysdeps/mach/xpg-strerror.c
==============================================================================
--- fsf/trunk/libc/sysdeps/mach/xpg-strerror.c (original)
+++ fsf/trunk/libc/sysdeps/mach/xpg-strerror.c Sun Dec 26 00:03:09 2010
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993, 1995, 1996, 1997, 1998, 2000, 2002, 2004
+/* Copyright (C) 1993, 1995, 1996, 1997, 1998, 2000, 2002, 2004, 2010
Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -53,30 +53,21 @@
code = err_get_code (errnum);
if (system > err_max_system || ! __mach_error_systems[system].bad_sub)
- {
- __set_errno (EINVAL);
- return -1;
- }
+ return EINVAL;
es = &__mach_error_systems[system];
if (sub >= es->max_sub)
estr = (const char *) es->bad_sub;
else if (code >= es->subsystem[sub].max_code)
- {
- __set_errno (EINVAL);
- return -1;
- }
+ return EINVAL;
else
estr = (const char *) _(es->subsystem[sub].codes[code]);
size_t estrlen = strlen (estr) + 1;
if (buflen < estrlen)
- {
- __set_errno (ERANGE);
- return -1;
- }
+ return ERANGE;
memcpy (buf, estr, estrlen);
return 0;
Added: fsf/trunk/libc/sysdeps/unix/sysv/linux/getrlimit64.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/getrlimit64.c (added)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/getrlimit64.c Sun Dec 26 00:03:09 2010
@@ -1,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
+}
Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/i386/getrlimit64.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/i386/getrlimit64.c (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/i386/getrlimit64.c Sun Dec 26 00:03:09 2010
@@ -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>
Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/kernel-features.h
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/kernel-features.h (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/kernel-features.h Sun Dec 26 00:03:09 2010
@@ -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
Added: fsf/trunk/libc/sysdeps/unix/sysv/linux/setrlimit64.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/setrlimit64.c (added)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/setrlimit64.c Sun Dec 26 00:03:09 2010
@@ -1,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
+}