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

* heap.cc (RAISEHEAP_SIZE): New definition. 

(user_heap_info::sbrk): Make failed commit an error condition again.
	Only reserve RAISEHEAP_SIZE sized chunk for further heap reservations
	by default.
This commit is contained in:
Corinna Vinschen 2013-08-31 10:21:48 +00:00
parent 348f503460
commit bffd6fb0e2
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,10 @@
2013-08-31 Corinna Vinschen <corinna@vinschen.de>
* heap.cc (RAISEHEAP_SIZE): New definition.
(user_heap_info::sbrk): Make failed commit an error condition again.
Only reserve RAISEHEAP_SIZE sized chunk for further heap reservations
by default.
2013-08-30 Christopher Faylor <me.cygwin2013@cgf.cx> 2013-08-30 Christopher Faylor <me.cygwin2013@cgf.cx>
* cygheap.h (user_heap_info::sbrk): Declare new function. * cygheap.h (user_heap_info::sbrk): Declare new function.

18
winsup/cygwin/heap.cc
View File

@ -24,7 +24,10 @@ details. */
static ptrdiff_t page_const; static ptrdiff_t page_const;
/* Minimum size of the base heap. */
#define MINHEAP_SIZE (4 * 1024 * 1024) #define MINHEAP_SIZE (4 * 1024 * 1024)
/* Chunksize of subsequent heap reservations. */
#define RAISEHEAP_SIZE (1 * 1024 * 1024)
static uintptr_t static uintptr_t
eval_start_address () eval_start_address ()
@ -277,20 +280,23 @@ user_heap_info::sbrk (ptrdiff_t n)
we have used up previously reserved memory. Or, we're just plumb out we have used up previously reserved memory. Or, we're just plumb out
of memory. Only attempt to commit memory that we know we've previously of memory. Only attempt to commit memory that we know we've previously
reserved. */ reserved. */
if (newtop <= max && VirtualAlloc (top, commitbytes, MEM_COMMIT, if (newtop <= max)
PAGE_READWRITE)) {
goto good; if (VirtualAlloc (top, commitbytes, MEM_COMMIT, PAGE_READWRITE))
goto good;
goto err;
}
/* The remainder of the existing heap is too small to fulfill the memory /* The remainder of the existing heap is too small to fulfill the memory
request. We have to extend the heap, so we reserve some more memory request. We have to extend the heap, so we reserve some more memory
and then commit the remainder of the old heap, if any, and the rest of and then commit the remainder of the old heap, if any, and the rest of
the required space from the extended heap. */ the required space from the extended heap. */
/* Reserve either the maximum of the standard heap chunk size /* For subsequent chunks following the base heap, reserve either 1 Megs
or the requested amount. Then attempt to actually allocate it. */ per chunk, or the requested amount if it's bigger than 1 Megs. */
reservebytes = commitbytes - ((char *) max - (char *) top); reservebytes = commitbytes - ((char *) max - (char *) top);
commitbytes -= reservebytes; commitbytes -= reservebytes;
if ((newbrksize = chunk) < reservebytes) if ((newbrksize = RAISEHEAP_SIZE) < reservebytes)
newbrksize = reservebytes; newbrksize = reservebytes;
if (VirtualAlloc (max, newbrksize, MEM_RESERVE, PAGE_NOACCESS) if (VirtualAlloc (max, newbrksize, MEM_RESERVE, PAGE_NOACCESS)