AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-21 20:40:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

malloc: Use __get_nprocs on arena_get2 (BZ 30945)

Browse Source 
This restore the 2.33 semantic for arena_get2.  It was changed by
11a02b035b to avoid arena_get2 call malloc (back when __get_nproc
was refactored to use an scratch_buffer - 903bc7dcc2).  The
__get_nproc was refactored over then and now it also avoid to call
malloc.

The 11a02b035b 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>
This commit is contained in:
Adhemerval Zanella 2023-10-11 13:43:56 -03:00
parent bd70d3bacf
commit 472894d2cf
5 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/sys/sysinfo.h
View File

@ -14,10 +14,6 @@ libc_hidden_proto (__get_nprocs_conf)
extern int __get_nprocs (void); extern int __get_nprocs (void);
libc_hidden_proto (__get_nprocs) libc_hidden_proto (__get_nprocs)
/* Return the number of available processors which the process can
be scheduled. */
extern int __get_nprocs_sched (void) attribute_hidden;
/* Return number of physical pages of memory in the system. */ /* Return number of physical pages of memory in the system. */
extern long int __get_phys_pages (void); extern long int __get_phys_pages (void);
libc_hidden_proto (__get_phys_pages) libc_hidden_proto (__get_phys_pages)

2
malloc/arena.c
View File

@ -824,7 +824,7 @@ arena_get2 (size_t size, mstate avoid_arena)
narenas_limit = mp_.arena_max; narenas_limit = mp_.arena_max;
else if (narenas > mp_.arena_test) else if (narenas > mp_.arena_test)
{ {
int n = __get_nprocs_sched (); int n = __get_nprocs ();
if (n >= 1) if (n >= 1)
narenas_limit = NARENAS_FROM_NCORES (n); narenas_limit = NARENAS_FROM_NCORES (n);

6
misc/getsysstats.c
View File

@ -44,12 +44,6 @@ weak_alias (__get_nprocs, get_nprocs)
link_warning (get_nprocs, "warning: get_nprocs will always return 1") link_warning (get_nprocs, "warning: get_nprocs will always return 1")
int
__get_nprocs_sched (void)
{
return 1;
}
long int long int
__get_phys_pages (void) __get_phys_pages (void)
{ {

6
sysdeps/mach/getsysstats.c
View File

@ -62,12 +62,6 @@ __get_nprocs (void)
libc_hidden_def (__get_nprocs) libc_hidden_def (__get_nprocs)
weak_alias (__get_nprocs, 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. */ /* Return the number of physical pages on the system. */
long int long int
__get_phys_pages (void) __get_phys_pages (void)

2
sysdeps/unix/sysv/linux/getsysstats.c
View File

@ -29,7 +29,7 @@
#include <sys/sysinfo.h> #include <sys/sysinfo.h>
#include <sysdep.h> #include <sysdep.h>
int static int
__get_nprocs_sched (void) __get_nprocs_sched (void)
{ {
enum enum