generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 5a973492: am c2085138: Merge "Fix sysconf for _SC_CHILD_MAX and _SC_OPEN_MAX."

Browse Source 
* commit '5a9734920c25ebb1aed389fd87fa9a26904aa239':
  Fix sysconf for _SC_CHILD_MAX and _SC_OPEN_MAX.
This commit is contained in:
Elliott Hughes
2015-02-17 21:32:28 +00:00
committed by Android Git Automerger
parent ebaf7a250f 5a9734920c
commit e64fd0c6c4
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libc/bionic/sysconf.cpp
View File

@@ -33,6 +33,7 @@
#include <pthread.h> #include <pthread.h>
#include <stdio.h> // For FOPEN_MAX. #include <stdio.h> // For FOPEN_MAX.
#include <sys/auxv.h> #include <sys/auxv.h>
#include <sys/resource.h>
#include <sys/sysconf.h> #include <sys/sysconf.h>
#include <sys/sysinfo.h> #include <sys/sysinfo.h>
#include <time.h> #include <time.h>
@@ -50,6 +51,12 @@ static bool __sysconf_has_clock(clockid_t clock_id) {
return clock_getres(clock_id, NULL) == 0; return clock_getres(clock_id, NULL) == 0;
} }
static long __sysconf_rlimit(int resource) {
rlimit rl;
getrlimit(resource, &rl);
return rl.rlim_cur;
}
long sysconf(int name) { long sysconf(int name) {
switch (name) { switch (name) {
case _SC_ARG_MAX: return ARG_MAX; case _SC_ARG_MAX: return ARG_MAX;
@@ -57,13 +64,13 @@ long sysconf(int name) {
case _SC_BC_DIM_MAX: return _POSIX2_BC_DIM_MAX; // Minimum requirement. case _SC_BC_DIM_MAX: return _POSIX2_BC_DIM_MAX; // Minimum requirement.
case _SC_BC_SCALE_MAX: return _POSIX2_BC_SCALE_MAX; // Minimum requirement. case _SC_BC_SCALE_MAX: return _POSIX2_BC_SCALE_MAX; // Minimum requirement.
case _SC_BC_STRING_MAX: return _POSIX2_BC_STRING_MAX; // Minimum requirement. case _SC_BC_STRING_MAX: return _POSIX2_BC_STRING_MAX; // Minimum requirement.
case _SC_CHILD_MAX: return CHILD_MAX; case _SC_CHILD_MAX: return __sysconf_rlimit(RLIMIT_NPROC);
case _SC_CLK_TCK: return static_cast<long>(getauxval(AT_CLKTCK)); case _SC_CLK_TCK: return static_cast<long>(getauxval(AT_CLKTCK));
case _SC_COLL_WEIGHTS_MAX: return _POSIX2_COLL_WEIGHTS_MAX; // Minimum requirement. case _SC_COLL_WEIGHTS_MAX: return _POSIX2_COLL_WEIGHTS_MAX; // Minimum requirement.
case _SC_EXPR_NEST_MAX: return _POSIX2_EXPR_NEST_MAX; // Minimum requirement. case _SC_EXPR_NEST_MAX: return _POSIX2_EXPR_NEST_MAX; // Minimum requirement.
case _SC_LINE_MAX: return _POSIX2_LINE_MAX; // Minimum requirement. case _SC_LINE_MAX: return _POSIX2_LINE_MAX; // Minimum requirement.
case _SC_NGROUPS_MAX: return NGROUPS_MAX; case _SC_NGROUPS_MAX: return NGROUPS_MAX;
case _SC_OPEN_MAX: return OPEN_MAX; case _SC_OPEN_MAX: return __sysconf_rlimit(RLIMIT_NOFILE);
case _SC_PASS_MAX: return PASS_MAX; case _SC_PASS_MAX: return PASS_MAX;
case _SC_2_C_BIND: return _POSIX2_C_BIND; case _SC_2_C_BIND: return _POSIX2_C_BIND;
case _SC_2_C_DEV: return _POSIX2_C_DEV; case _SC_2_C_DEV: return _POSIX2_C_DEV;