JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* heap.cc (heap_init): Change type of largest_found to PVOID. Start

Browse Source 
querying memory at 0x20000000.  Use largest_found pointer when trying
	to allocate largest free memory area found.
This commit is contained in:
Corinna Vinschen 2011-07-18 08:43:49 +00:00
parent ec5c578057
commit b6c42976eb
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,9 @@
2011-07-18 Corinna Vinschen <corinna@vinschen.de>
* heap.cc (heap_init): Change type of largest_found to PVOID. Start
querying memory at 0x20000000. Use largest_found pointer when trying
to allocate largest free memory area found.
2011-07-14 Corinna Vinschen <corinna@vinschen.de>
* fhandler_console.cc (fhandler_console::input_tcsetattr): Revert to

11
winsup/cygwin/heap.cc
View File

@ -43,7 +43,7 @@ heap_init ()
This should work right from the start in 99% of the cases. But,
there's always a but. Read on... */
uintptr_t start_address = 0x20000000L;
uintptr_t largest_found = 0;
PVOID largest_found = NULL;
size_t largest_found_size = 0;
SIZE_T ret;
MEMORY_BASIC_INFORMATION mbi;
@ -60,8 +60,8 @@ heap_init ()
/* Ok, so we are at the 1% which didn't work with 0x20000000 out
of the box. What we do now is to search for the next free
region which matches our desired heap size. While doing that,
we keep track of the largest region we found. */
start_address += wincap.allocation_granularity ();
we keep track of the largest region we found, including the
region starting at 0x20000000. */
while ((ret = VirtualQuery ((LPCVOID) start_address, &mbi,
sizeof mbi)) != 0)
{
@ -71,7 +71,7 @@ heap_init ()
break;
if (mbi.RegionSize > largest_found_size)
{
largest_found = (uintptr_t) mbi.BaseAddress;
largest_found = mbi.BaseAddress;
largest_found_size = mbi.RegionSize;
}
}
@ -91,8 +91,7 @@ heap_init ()
{
cygheap->user_heap.chunk = largest_found_size;
cygheap->user_heap.base =
VirtualAlloc ((LPVOID) start_address,
cygheap->user_heap.chunk,
VirtualAlloc (largest_found, cygheap->user_heap.chunk,
alloctype, PAGE_NOACCESS);
}
/* Last resort (but actually we are probably broken anyway):