From 5e3d8e668238f1ebbf96843ceb0a699d73a16a38 Mon Sep 17 00:00:00 2001 From: Nicolas Cavallari Date: Tue, 14 Jun 2016 15:12:18 +0200 Subject: sysconf: Support _SC_(AV)?PHYS_PAGES. Do it by following the trail of the existing commented code, which implemented it by calling get_phys_pages() and get_avphys_pages(). This patch implements these two functions, which are also glibc extensions. Some program/libraries (e.g. libuv) assumes that sysconf(_SC_PHYS_PAGES) works on linux and never check for -1, thus they report an insane amount of memory. Signed-off-by: Nicolas Cavallari --- libc/unistd/sysconf.c | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) (limited to 'libc') diff --git a/libc/unistd/sysconf.c b/libc/unistd/sysconf.c index 503b39585..3d3b1a5ff 100644 --- a/libc/unistd/sysconf.c +++ b/libc/unistd/sysconf.c @@ -43,6 +43,32 @@ #include #include "internal/parse_config.h" +long int get_phys_pages(void) +{ + struct sysinfo si; + int ps = getpagesize();; + + sysinfo(&si); + + if (ps >= si.mem_unit) + return si.totalram / (ps / si.mem_unit); + else + return si.totalram * (si.mem_unit / ps); +} + +long int get_avphys_pages(void) +{ + struct sysinfo si; + int ps = getpagesize();; + + sysinfo(&si); + + if (ps >= si.mem_unit) + return si.freeram / (ps / si.mem_unit); + else + return si.freeram * (si.mem_unit / ps); +} + static int nprocessors_onln(void) { char **l = NULL; @@ -747,18 +773,10 @@ long int sysconf(int name) RETURN_FUNCTION(nprocessors_onln()); case _SC_PHYS_PAGES: -#if 0 RETURN_FUNCTION(get_phys_pages()); -#else - RETURN_NEG_1; -#endif case _SC_AVPHYS_PAGES: -#if 0 RETURN_FUNCTION(get_avphys_pages()); -#else - RETURN_NEG_1; -#endif case _SC_ATEXIT_MAX: return __UCLIBC_MAX_ATEXIT; -- cgit v1.2.3