about summary refs log tree commit diff
path: root/malloc
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:56:44 -0300
commit23021eda75eee44b4b2ae350e63dc404dac6407d (patch)
treec84339debbf325aeb80122cf01435aee00b6c225 /malloc
parenteee7525d35ec16bbe81435e41079ab72519d825c (diff)
downloadglibc-23021eda75eee44b4b2ae350e63dc404dac6407d.tar.gz
glibc-23021eda75eee44b4b2ae350e63dc404dac6407d.tar.xz
glibc-23021eda75eee44b4b2ae350e63dc404dac6407d.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 'malloc')
-rw-r--r--malloc/arena.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/malloc/arena.c b/malloc/arena.c
index ccd193953b..78416205b6 100644
--- a/malloc/arena.c
+++ b/malloc/arena.c
@@ -934,7 +934,7 @@ arena_get2 (size_t size, mstate avoid_arena)
             narenas_limit = mp_.arena_max;
           else if (narenas > mp_.arena_test)
             {
-              int n = __get_nprocs_sched ();
+              int n = __get_nprocs ();
 
               if (n >= 1)
                 narenas_limit = NARENAS_FROM_NCORES (n);