diff options
author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2023-10-11 13:43:56 -0300 |
---|---|---|
committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2024-02-12 10:01:23 -0300 |
commit | 8e99cc76a26a88589aaa4e54c1ae48fa27be26b7 (patch) | |
tree | fe1aa5dfb0379f7d2097a02abb6ea48e313ff2df /sysdeps | |
parent | ec6aaab3e1d754a1ad762f9e9ca4e2525ce87ad3 (diff) | |
download | glibc-8e99cc76a26a88589aaa4e54c1ae48fa27be26b7.tar.gz glibc-8e99cc76a26a88589aaa4e54c1ae48fa27be26b7.tar.xz glibc-8e99cc76a26a88589aaa4e54c1ae48fa27be26b7.zip |
malloc: Use __get_nprocs on arena_get2 (BZ 30945)
This restore the 2.33 semantic for arena_get2. It was changed by 11a02b035b46 to avoid arena_get2 call malloc (back when __get_nproc was refactored to use an scratch_buffer - 903bc7dcc2acafc). The __get_nproc was refactored over then and now it also avoid to call malloc. The 11a02b035b46 did not take in consideration any performance implication, which should have been discussed properly. The __get_nprocs_sched is still used as a fallback mechanism if procfs and sysfs is not acessible. Checked on x86_64-linux-gnu. Reviewed-by: DJ Delorie <dj@redhat.com> (cherry picked from commit 472894d2cfee5751b44c0aaa71ed87df81c8e62e)
Diffstat (limited to 'sysdeps')
-rw-r--r-- | sysdeps/mach/getsysstats.c | 6 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/getsysstats.c | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/sysdeps/mach/getsysstats.c b/sysdeps/mach/getsysstats.c index 37ea5e6a7a..80ea7e17cb 100644 --- a/sysdeps/mach/getsysstats.c +++ b/sysdeps/mach/getsysstats.c @@ -62,12 +62,6 @@ __get_nprocs (void) libc_hidden_def (__get_nprocs) weak_alias (__get_nprocs, get_nprocs) -int -__get_nprocs_sched (void) -{ - return __get_nprocs (); -} - /* Return the number of physical pages on the system. */ long int __get_phys_pages (void) diff --git a/sysdeps/unix/sysv/linux/getsysstats.c b/sysdeps/unix/sysv/linux/getsysstats.c index 064eaa08ae..4d01786120 100644 --- a/sysdeps/unix/sysv/linux/getsysstats.c +++ b/sysdeps/unix/sysv/linux/getsysstats.c @@ -29,7 +29,7 @@ #include <sys/sysinfo.h> #include <sysdep.h> -int +static int __get_nprocs_sched (void) { enum |