aboutsummaryrefslogtreecommitdiff
path: root/sysdeps
diff options
context:
space:
mode:
authorAdhemerval Zanella <adhemerval.zanella@linaro.org>2023-10-11 13:43:56 -0300
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>2024-02-12 09:53:27 -0300
commit506e47da1d66b33e24440a495eeef85daf7f2a78 (patch)
tree31b54c970ff518fbe3861c3b45bd0b9cf672c11c /sysdeps
parentb09073e63138ce409bf6426cf820eeaa0d28ca74 (diff)
downloadglibc-506e47da1d66b33e24440a495eeef85daf7f2a78.zip
glibc-506e47da1d66b33e24440a495eeef85daf7f2a78.tar.gz
glibc-506e47da1d66b33e24440a495eeef85daf7f2a78.tar.bz2
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.c6
-rw-r--r--sysdeps/unix/sysv/linux/getsysstats.c2
2 files changed, 1 insertions, 7 deletions
diff --git a/sysdeps/mach/getsysstats.c b/sysdeps/mach/getsysstats.c
index 5184e5e..d3834f3 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 b0b6c15..1ea7f1f 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