diff options
author | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-04-05 00:02:15 +0000 |
---|---|---|
committer | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-04-05 00:02:15 +0000 |
commit | 00149290a194fe51f26d37ac5a37c536ddaa7b44 (patch) | |
tree | 7e1cbd0df7cdc84ec806fd27d00a85113d7564c1 /libgo/runtime | |
parent | b8439d263974fb29dc3ff2ed7bf1f127b391bf42 (diff) | |
download | gcc-00149290a194fe51f26d37ac5a37c536ddaa7b44.tar.gz |
libgo: Use MAP_FIXED if necessary to grab arena.
From Rainer Orth.
PR go/48240
* configure.ac: Check for mincore.
* configure: Regenerate.
* config.h.in: Regenerate.
* runtime/mem.c: Include unistd.h.
(addrspace_free): New function.
(runtime_SysMap): Retry 64-bit runtime_mmap with MAP_FIXED.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@171961 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgo/runtime')
-rw-r--r-- | libgo/runtime/mem.c | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/libgo/runtime/mem.c b/libgo/runtime/mem.c index f62a4d37ee7..90c2c61aff9 100644 --- a/libgo/runtime/mem.c +++ b/libgo/runtime/mem.c @@ -1,4 +1,5 @@ #include <errno.h> +#include <unistd.h> #include "runtime.h" #include "malloc.h" @@ -16,6 +17,23 @@ static int dev_zero = -1; #endif +static _Bool +addrspace_free(void *v __attribute__ ((unused)), uintptr n __attribute__ ((unused))) +{ +#ifdef HAVE_MINCORE + size_t page_size = getpagesize(); + size_t off; + char one_byte; + + errno = 0; + for(off = 0; off < n; off += page_size) + if(mincore((char *)v + off, page_size, (void *)&one_byte) != -1 + || errno != ENOMEM) + return 0; +#endif + return 1; +} + void* runtime_SysAlloc(uintptr n) { @@ -109,6 +127,11 @@ runtime_SysMap(void *v, uintptr n) // On 64-bit, we don't actually have v reserved, so tread carefully. if(sizeof(void*) == 8) { p = runtime_mmap(v, n, PROT_READ|PROT_WRITE|PROT_EXEC, MAP_ANON|MAP_PRIVATE, fd, 0); + if(p != v && addrspace_free(v, n)) { + // On some systems, mmap ignores v without + // MAP_FIXED, so retry if the address space is free. + p = runtime_mmap(v, n, PROT_READ|PROT_WRITE|PROT_EXEC, MAP_ANON|MAP_FIXED|MAP_PRIVATE, fd, 0); + } if(p != v) { runtime_printf("runtime: address space conflict: map(%p) = %p\n", v, p); runtime_throw("runtime: address space conflict"); |