diff options
| author | Khem Raj <raj.khem@gmail.com> | 2010-07-09 11:23:36 -0700 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2010-07-09 11:23:36 -0700 |
| commit | 87c1f3f912593910b978b51d62f549e4dc32e8fb (patch) | |
| tree | 766a2d288c330d36794124610b19f2080c7f13e0 /libc | |
| parent | 42fb51e0d4e7ab9fe8ff2be3a7405acb8d44e9b2 (diff) | |
include/param.h: Dont use ARG_MAX from kernel headers
* Use getrlimit for ARG_MAX in sysconf on nptl.
* Define NCARGS directly instead of ARG_MAX
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'libc')
| -rw-r--r-- | libc/sysdeps/linux/common/bits/local_lim.h | 10 | ||||
| -rw-r--r-- | libc/unistd/sysconf.c | 15 |
2 files changed, 23 insertions, 2 deletions
diff --git a/libc/sysdeps/linux/common/bits/local_lim.h b/libc/sysdeps/linux/common/bits/local_lim.h index 023ebf3d0..a263b5d28 100644 --- a/libc/sysdeps/linux/common/bits/local_lim.h +++ b/libc/sysdeps/linux/common/bits/local_lim.h @@ -1,5 +1,5 @@ /* Minimum guaranteed maximum values for system limits. Linux version. - Copyright (C) 1993-1998,2000,2002,2003,2004 Free Software Foundation, Inc. + Copyright (C) 1993-1998,2000,2002-2004,2008 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 @@ -31,6 +31,9 @@ #ifndef OPEN_MAX # define __undef_OPEN_MAX #endif +#ifndef ARG_MAX +# define __undef_ARG_MAX +#endif /* The kernel sources contain a file with all the needed information. */ #include <linux/limits.h> @@ -50,6 +53,11 @@ # undef OPEN_MAX # undef __undef_OPEN_MAX #endif +/* Have to remove ARG_MAX? */ +#ifdef __undef_ARG_MAX +# undef ARG_MAX +# undef __undef_ARG_MAX +#endif /* The number of data keys per process. */ #define _POSIX_THREAD_KEYS_MAX 128 diff --git a/libc/unistd/sysconf.c b/libc/unistd/sysconf.c index b7cb4946f..d118f1b95 100644 --- a/libc/unistd/sysconf.c +++ b/libc/unistd/sysconf.c @@ -36,6 +36,8 @@ #endif #ifdef __UCLIBC_HAS_THREADS_NATIVE__ #include <sysdep.h> +#include <sys/resource.h> + #endif #ifndef num_present_cpus @@ -81,9 +83,16 @@ #define RETURN_FUNCTION(f) return f; #endif /* _UCLIBC_GENERATE_SYSCONF_ARCH */ +/* Legacy value of ARG_MAX. The macro is now not defined since the + actual value varies based on the stack size. */ +#define legacy_ARG_MAX 131072 + /* Get the value of the system variable NAME. */ long int sysconf(int name) { +#ifdef __UCLIBC_HAS_THREADS_NATIVE__ + struct rlimit rlimit; +#endif switch (name) { default: @@ -91,7 +100,11 @@ long int sysconf(int name) return -1; case _SC_ARG_MAX: -#ifdef ARG_MAX +#ifdef __UCLIBC_HAS_THREADS_NATIVE__ + /* Use getrlimit to get the stack limit. */ + if (getrlimit (RLIMIT_STACK, &rlimit) == 0) + return MAX (legacy_ARG_MAX, rlimit.rlim_cur / 4); +#elif defined ARG_MAX return ARG_MAX; #else RETURN_NEG_1; |