tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Stop trying to be clever with sysconf(_SC_NGROUPS_MAX)." into main

Browse source
This commit is contained in:
Elliott Hughes 2024-02-22 15:35:23 +00:00 committed by Gerrit Code Review
commit 85164759f7
1 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
libc/bionic/sysconf.cpp
View file

@ -41,16 +41,6 @@
#include "platform/bionic/page.h"
#include "private/bionic_tls.h"
static long __sysconf_fread_long(const char* path) {
long result = 0;
FILE* fp = fopen(path, "re");
if (fp != nullptr) {
fscanf(fp, "%ld", &result);
fclose(fp);
}
return result;
}
struct sysconf_cache {
long size, assoc, linesize;
@ -100,6 +90,16 @@ static sysconf_caches* __sysconf_caches() {
#else
static long __sysconf_fread_long(const char* path) {
long result = 0;
FILE* fp = fopen(path, "re");
if (fp != nullptr) {
fscanf(fp, "%ld", &result);
fclose(fp);
}
return result;
}
static sysconf_caches* __sysconf_caches() {
static sysconf_caches cached = []{
sysconf_caches info = {};
@ -182,8 +182,8 @@ long sysconf(int name) {
case _SC_AVPHYS_PAGES: return get_avphys_pages();
case _SC_CHILD_MAX: return __sysconf_rlimit(RLIMIT_NPROC);
case _SC_CLK_TCK: return static_cast<long>(getauxval(AT_CLKTCK));
case _SC_NGROUPS_MAX: return __sysconf_fread_long("/proc/sys/kernel/ngroups_max");
case _SC_CLK_TCK:
return static_cast<long>(getauxval(AT_CLKTCK));
case _SC_NPROCESSORS_CONF: return get_nprocs_conf();
case _SC_NPROCESSORS_ONLN: return get_nprocs();
case _SC_OPEN_MAX: return __sysconf_rlimit(RLIMIT_NOFILE);
@ -205,6 +205,11 @@ long sysconf(int name) {
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_LINE_MAX: return _POSIX2_LINE_MAX; // Minimum requirement.
case _SC_NGROUPS_MAX:
// Only root can read /proc/sys/kernel/ngroups_max on Android, and groups
// are vestigial anyway, so the "maximum maximum" of NGROUPS_MAX is a good
// enough answer for _SC_NGROUPS_MAX...
return NGROUPS_MAX;
case _SC_PASS_MAX: return PASS_MAX;
case _SC_2_C_BIND: return _POSIX2_C_BIND;
case _SC_2_C_DEV: return _POSIX2_C_DEV;