lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00
Code Activity

* malloc/malloc.c (sYSMALLOc): Remove some unnecessary alignment

Browse Source 
attempts.
This commit is contained in:
Ulrich Drepper
2006-12-24 21:19:20 +00:00
parent 3b6667a4ab
commit 48576885c6
2 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2006-12-24 Ulrich Drepper <drepper@redhat.com>
* malloc/malloc.c (sYSMALLOc): Remove some unnecessary alignment
attempts.
2006-12-23 Ulrich Drepper <drepper@redhat.com> 2006-12-23 Ulrich Drepper <drepper@redhat.com>
* posix/wordexp.c: Remove some unnecessary tests. * posix/wordexp.c: Remove some unnecessary tests.

16
malloc/malloc.c
View File

@ -2896,7 +2896,13 @@ static Void_t* sYSMALLOc(nb, av) INTERNAL_SIZE_T nb; mstate av;
is one SIZE_SZ unit larger than for normal chunks, because there is one SIZE_SZ unit larger than for normal chunks, because there
is no following chunk whose prev_size field could be used. is no following chunk whose prev_size field could be used.
*/ */
#if 1
/* See the front_misalign handling below, for glibc there is no
need for further alignments. */
size = (nb + SIZE_SZ + pagemask) & ~pagemask;
#else
size = (nb + SIZE_SZ + MALLOC_ALIGN_MASK + pagemask) & ~pagemask; size = (nb + SIZE_SZ + MALLOC_ALIGN_MASK + pagemask) & ~pagemask;
#endif
tried_mmap = true; tried_mmap = true;
/* Don't try if size wraps around 0 */ /* Don't try if size wraps around 0 */
@ -2914,6 +2920,12 @@ static Void_t* sYSMALLOc(nb, av) INTERNAL_SIZE_T nb; mstate av;
address argument for later munmap in free() and realloc(). address argument for later munmap in free() and realloc().
*/ */
#if 1
/* For glibc, chunk2mem increases the address by 2*SIZE_SZ and
MALLOC_ALIGN_MASK is 2*SIZE_SZ-1. Each mmap'ed area is page
aligned and therefore definitely MALLOC_ALIGN_MASK-aligned. */
assert (((INTERNAL_SIZE_T)chunk2mem(mm) & MALLOC_ALIGN_MASK) == 0);
#else
front_misalign = (INTERNAL_SIZE_T)chunk2mem(mm) & MALLOC_ALIGN_MASK; front_misalign = (INTERNAL_SIZE_T)chunk2mem(mm) & MALLOC_ALIGN_MASK;
if (front_misalign > 0) { if (front_misalign > 0) {
correction = MALLOC_ALIGNMENT - front_misalign; correction = MALLOC_ALIGNMENT - front_misalign;
@ -2921,7 +2933,9 @@ static Void_t* sYSMALLOc(nb, av) INTERNAL_SIZE_T nb; mstate av;
p->prev_size = correction; p->prev_size = correction;
set_head(p, (size - correction) |IS_MMAPPED); set_head(p, (size - correction) |IS_MMAPPED);
} }
else { else
#endif
{
p = (mchunkptr)mm; p = (mchunkptr)mm;
set_head(p, size|IS_MMAPPED); set_head(p, size|IS_MMAPPED);
} }