lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-08-08 17:42:12 +03:00
Code Activity

malloc: Cleanup madvise defines

Browse Source 
Remove redundant ifdefs for madvise/THP.

Reviewed-by: DJ Delorie <dj@redhat.com>
This commit is contained in:
Wilco Dijkstra
2025-07-10 16:04:24 +00:00
parent 2df57ad95c
commit 21fda179c2
1 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
malloc/malloc.c
View File

@@ -2438,11 +2438,8 @@ sysmalloc_mmap (INTERNAL_SIZE_T nb, size_t pagesize, int extra_flags, mstate av)
extra_flags); extra_flags);
if (mm == MAP_FAILED) if (mm == MAP_FAILED)
return mm; return mm;
if (extra_flags == 0)
#ifdef MAP_HUGETLB
if (!(extra_flags & MAP_HUGETLB))
madvise_thp (mm, size); madvise_thp (mm, size);
#endif
__set_vma_name (mm, size, " glibc: malloc"); __set_vma_name (mm, size, " glibc: malloc");
@@ -2526,10 +2523,8 @@ sysmalloc_mmap_fallback (long int *s, INTERNAL_SIZE_T nb,
if (mbrk == MAP_FAILED) if (mbrk == MAP_FAILED)
return MAP_FAILED; return MAP_FAILED;
#ifdef MAP_HUGETLB if (extra_flags == 0)
if (!(extra_flags & MAP_HUGETLB))
madvise_thp (mbrk, size); madvise_thp (mbrk, size);
#endif
__set_vma_name (mbrk, size, " glibc: malloc"); __set_vma_name (mbrk, size, " glibc: malloc");
@@ -2700,7 +2695,6 @@ sysmalloc (INTERNAL_SIZE_T nb, mstate av)
previous calls. Otherwise, we correct to page-align below. previous calls. Otherwise, we correct to page-align below.
*/ */
#ifdef MADV_HUGEPAGE
/* Defined in brk.c. */ /* Defined in brk.c. */
extern void *__curbrk; extern void *__curbrk;
if (__glibc_unlikely (mp_.thp_pagesize != 0)) if (__glibc_unlikely (mp_.thp_pagesize != 0))
@@ -2710,7 +2704,6 @@ sysmalloc (INTERNAL_SIZE_T nb, mstate av)
size = top - (uintptr_t) __curbrk; size = top - (uintptr_t) __curbrk;
} }
else else
#endif
size = ALIGN_UP (size, GLRO(dl_pagesize)); size = ALIGN_UP (size, GLRO(dl_pagesize));
/* /*
@@ -2985,11 +2978,9 @@ systrim (size_t pad, mstate av)
return 0; return 0;
/* Release in pagesize units and round down to the nearest page. */ /* Release in pagesize units and round down to the nearest page. */
#ifdef MADV_HUGEPAGE
if (__glibc_unlikely (mp_.thp_pagesize != 0)) if (__glibc_unlikely (mp_.thp_pagesize != 0))
extra = ALIGN_DOWN (top_area - pad, mp_.thp_pagesize); extra = ALIGN_DOWN (top_area - pad, mp_.thp_pagesize);
else else
#endif
extra = ALIGN_DOWN (top_area - pad, GLRO(dl_pagesize)); extra = ALIGN_DOWN (top_area - pad, GLRO(dl_pagesize));
if (extra == 0) if (extra == 0)