drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* libc/stdlib/mallocr.c (malloc_extend_top): If correction sbrk 

fails, don't bail out, and try to correct next time.
This commit is contained in:
Alexandre Oliva 2002-04-13 10:27:02 +00:00
parent 0cc261b11d
commit 2f3009bd13
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
newlib/ChangeLog
View File

@ -1,5 +1,8 @@
2002-04-13 Alexandre Oliva <aoliva@redhat.com> 2002-04-13 Alexandre Oliva <aoliva@redhat.com>
* libc/stdlib/mallocr.c (malloc_extend_top): If correction sbrk
fails, don't bail out, and try to correct next time.
* libc/include/sys/config.h: Include limits.h. * libc/include/sys/config.h: Include limits.h.
2002-04-12 Eric Norum <eric.norum@usask.com> 2002-04-12 Eric Norum <eric.norum@usask.com>

15
newlib/libc/stdlib/mallocr.c
View File

@ -2128,6 +2128,7 @@ static void malloc_extend_top(RARG nb) RDECL INTERNAL_SIZE_T nb;
char* brk; /* return value from sbrk */ char* brk; /* return value from sbrk */
INTERNAL_SIZE_T front_misalign; /* unusable bytes at front of sbrked space */ INTERNAL_SIZE_T front_misalign; /* unusable bytes at front of sbrked space */
INTERNAL_SIZE_T correction; /* bytes for 2nd sbrk call */ INTERNAL_SIZE_T correction; /* bytes for 2nd sbrk call */
int correction_failed = 0; /* whether we should relax the assertion */
char* new_brk; /* return of 2nd sbrk call */ char* new_brk; /* return of 2nd sbrk call */
INTERNAL_SIZE_T top_size; /* new size of top chunk */ INTERNAL_SIZE_T top_size; /* new size of top chunk */
@ -2156,7 +2157,9 @@ static void malloc_extend_top(RARG nb) RDECL INTERNAL_SIZE_T nb;
sbrked_mem += sbrk_size; sbrked_mem += sbrk_size;
if (brk == old_end) /* can just add bytes to current top */ if (brk == old_end /* can just add bytes to current top, unless
previous correction failed */
&& ((POINTER_UINT)old_end & (pagesz - 1)) == 0)
{ {
top_size = sbrk_size + old_top_size; top_size = sbrk_size + old_top_size;
set_head(top, top_size | PREV_INUSE); set_head(top, top_size | PREV_INUSE);
@ -2183,7 +2186,12 @@ static void malloc_extend_top(RARG nb) RDECL INTERNAL_SIZE_T nb;
/* Allocate correction */ /* Allocate correction */
new_brk = (char*)(MORECORE (correction)); new_brk = (char*)(MORECORE (correction));
if (new_brk == (char*)(MORECORE_FAILURE)) return; if (new_brk == (char*)(MORECORE_FAILURE))
{
correction = 0;
correction_failed = 1;
new_brk = brk;
}
sbrked_mem += correction; sbrked_mem += correction;
@ -2228,7 +2236,8 @@ static void malloc_extend_top(RARG nb) RDECL INTERNAL_SIZE_T nb;
#endif #endif
/* We always land on a page boundary */ /* We always land on a page boundary */
assert(((unsigned long)((char*)top + top_size) & (pagesz - 1)) == 0); assert(((unsigned long)((char*)top + top_size) & (pagesz - 1)) == 0
|| correction_failed);
} }
#endif /* DEFINE_MALLOC */ #endif /* DEFINE_MALLOC */