romenskiy2012/jemalloc
1
0
Fork 0
mirror of https://github.com/jemalloc/jemalloc.git synced 2026-04-14 14:41:42 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge fc4a4d74eb into 1972241cd2

Browse source
This commit is contained in:
Paul Smith 2025-06-02 21:54:12 +03:00 • committed by GitHub
commit 7361bb1c36
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/jemalloc/internal/jemalloc_internal_defs.h.in
View file

@ -258,6 +258,7 @@
/*
* popcount*() functions to use for bitmapping.
*/
#undef JEMALLOC_INTERNAL_POPCOUNTLL
#undef JEMALLOC_INTERNAL_POPCOUNTL
#undef JEMALLOC_INTERNAL_POPCOUNT

11
src/jemalloc.c
View file

@ -2115,7 +2115,7 @@ malloc_init_narenas(tsdn_t *tsdn) {
} else {
if (ncpus >= MALLOCX_ARENA_LIMIT) {
malloc_printf("<jemalloc>: narenas w/ percpu"
"arena beyond limit (%d)\n", ncpus);
"arena beyond limit (%u)\n", ncpus);
if (opt_abort) {
abort();
}
@ -2163,7 +2163,7 @@ malloc_init_narenas(tsdn_t *tsdn) {
*/
if (narenas_auto >= MALLOCX_ARENA_LIMIT) {
narenas_auto = MALLOCX_ARENA_LIMIT - 1;
malloc_printf("<jemalloc>: Reducing narenas to limit (%d)\n",
malloc_printf("<jemalloc>: Reducing narenas to limit (%u)\n",
narenas_auto);
}
narenas_total_set(narenas_auto);
@ -3269,7 +3269,12 @@ JEMALLOC_EXPORT void *(*__memalign_hook)(size_t alignment, size_t size) =
* be implemented also, so none of glibc's malloc.o functions are added to the
* link.
*/
# define ALIAS(je_fn) __attribute__((alias (#je_fn), used))
# ifdef __clang__
/* Clang doesn't support GCC's copy() attribute. */
# define ALIAS(je_fn) __attribute__((alias (#je_fn), used))
# else
# define ALIAS(je_fn) __attribute__((alias (#je_fn), copy(je_fn)))
# endif
/* To force macro expansion of je_ prefix before stringification. */
# define PREALIAS(je_fn) ALIAS(je_fn)
# ifdef JEMALLOC_OVERRIDE___LIBC_CALLOC