X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FMBlock.c;h=0ce1e762a9eeeab2412c1947d4cb77edf44d4ef5;hb=153b9cb9b11e05c4edb1b6bc0a7b972660e41f70;hp=4d4b1a38c3e4d98cc091e8155bc8954ff414450c;hpb=04793e4a7573ff2f02ad2cc59614b66c434874b7;p=ghc-hetmet.git diff --git a/ghc/rts/MBlock.c b/ghc/rts/MBlock.c index 4d4b1a3..0ce1e76 100644 --- a/ghc/rts/MBlock.c +++ b/ghc/rts/MBlock.c @@ -1,5 +1,4 @@ /* ----------------------------------------------------------------------------- - * $Id: MBlock.c,v 1.48 2003/09/19 09:04:09 simonmar Exp $ * * (c) The GHC Team 1998-1999 * @@ -30,7 +29,7 @@ #ifdef HAVE_SYS_TYPES_H #include #endif -#ifndef mingw32_TARGET_OS +#ifndef mingw32_HOST_OS # ifdef HAVE_SYS_MMAN_H # include # endif @@ -41,7 +40,7 @@ #if HAVE_WINDOWS_H #include #endif -#if darwin_TARGET_OS +#if darwin_HOST_OS #include #endif @@ -53,9 +52,62 @@ lnat mblocks_allocated = 0; The MBlock Map: provides our implementation of HEAP_ALLOCED() -------------------------------------------------------------------------- */ -#ifdef MBLOCK_MAP_SIZE +#if SIZEOF_VOID_P == 4 StgWord8 mblock_map[MBLOCK_MAP_SIZE]; // initially all zeros +#elif SIZEOF_VOID_P == 8 +static MBlockMap dummy_mblock_map; +MBlockMap *mblock_cache = &dummy_mblock_map; +int mblock_map_count = 0; +MBlockMap **mblock_maps = NULL; + +static MBlockMap * +findMBlockMap(void *p) +{ + int i; + StgWord32 hi = (StgWord32) (((StgWord)p) >> 32); + for( i = 0; i < mblock_map_count; i++ ) + { + if(mblock_maps[i]->addrHigh32 == hi) + { + return mblock_maps[i]; + } + } + return NULL; +} + +StgBool +slowIsHeapAlloced(void *p) +{ + MBlockMap *map = findMBlockMap(p); + if(map) + { + mblock_cache = map; + return map->mblocks[MBLOCK_MAP_ENTRY(p)]; + } + else + return 0; +} +#endif + +static void +markHeapAlloced(void *p) +{ +#if SIZEOF_VOID_P == 4 + mblock_map[MBLOCK_MAP_ENTRY(p)] = 1; +#elif SIZEOF_VOID_P == 8 + MBlockMap *map = findMBlockMap(p); + if(map == NULL) + { + mblock_map_count++; + mblock_maps = realloc(mblock_maps, + sizeof(MBlockMap*) * mblock_map_count); + map = mblock_maps[mblock_map_count-1] = calloc(1,sizeof(MBlockMap)); + map->addrHigh32 = (StgWord32) (((StgWord)p) >> 32); + } + map->mblocks[MBLOCK_MAP_ENTRY(p)] = 1; + mblock_cache = map; #endif +} /* ----------------------------------------------------------------------------- Allocate new mblock(s) @@ -84,7 +136,7 @@ getMBlock(void) again using the general method. -------------------------------------------------------------------------- */ -#if !defined(mingw32_TARGET_OS) && !defined(cygwin32_TARGET_OS) +#if !defined(mingw32_HOST_OS) && !defined(cygwin32_HOST_OS) // A wrapper around mmap(), to abstract away from OS differences in // the mmap() interface. @@ -94,16 +146,16 @@ my_mmap (void *addr, lnat size) { void *ret; -#if defined(solaris2_TARGET_OS) || defined(irix_TARGET_OS) +#if defined(solaris2_HOST_OS) || defined(irix_HOST_OS) { int fd = open("/dev/zero",O_RDONLY); ret = mmap(addr, size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0); close(fd); } -#elif hpux_TARGET_OS +#elif hpux_HOST_OS ret = mmap(addr, size, PROT_READ | PROT_WRITE, MAP_ANONYMOUS | MAP_PRIVATE, -1, 0); -#elif darwin_TARGET_OS +#elif darwin_HOST_OS // Without MAP_FIXED, Apple's mmap ignores addr. // With MAP_FIXED, it overwrites already mapped regions, whic // mmap(0, ... MAP_FIXED ...) is worst of all: It unmaps the program text @@ -120,7 +172,7 @@ my_mmap (void *addr, lnat size) err = vm_allocate(mach_task_self(),(vm_address_t*) &ret, size, TRUE); if(err) // don't know what the error codes mean exactly - barf("memory allocation failed (requested %d bytes)", size); + barf("memory allocation failed (requested %lu bytes)", size); else vm_protect(mach_task_self(),ret,size,FALSE,VM_PROT_READ|VM_PROT_WRITE); #else @@ -133,7 +185,7 @@ my_mmap (void *addr, lnat size) (errno == EINVAL && sizeof(void*)==4 && size >= 0xc0000000)) { // If we request more than 3Gig, then we get EINVAL // instead of ENOMEM (at least on Linux). - prog_belch("out of memory (requested %d bytes)", size); + errorBelch("out of memory (requested %lu bytes)", size); stg_exit(EXIT_FAILURE); } else { barf("getMBlock: mmap: %s", strerror(errno)); @@ -205,7 +257,7 @@ getMBlocks(nat n) if (((W_)ret & MBLOCK_MASK) != 0) { // misaligned block! #if 0 // defined(DEBUG) - belch("warning: getMBlock: misaligned block %p returned when allocating %d megablock(s) at %p", ret, n, next_request); + errorBelch("warning: getMBlock: misaligned block %p returned when allocating %d megablock(s) at %p", ret, n, next_request); #endif // unmap this block... @@ -221,11 +273,11 @@ getMBlocks(nat n) // ToDo: check that we haven't already grabbed the memory at next_request next_request = ret + size; - IF_DEBUG(gc,fprintf(stderr,"Allocated %d megablock(s) at %p\n",n,ret)); + IF_DEBUG(gc,debugBelch("Allocated %d megablock(s) at %p\n",n,ret)); // fill in the table for (i = 0; i < n; i++) { - MARK_HEAP_ALLOCED( ret + i * MBLOCK_SIZE ); + markHeapAlloced( ret + i * MBLOCK_SIZE ); } mblocks_allocated += n; @@ -233,7 +285,7 @@ getMBlocks(nat n) return ret; } -#else /* defined(mingw32_TARGET_OS) || defined(cygwin32_TARGET_OS) */ +#else /* defined(mingw32_HOST_OS) || defined(cygwin32_HOST_OS) */ /* On Win32 platforms we make use of the two-phased virtual memory API @@ -265,13 +317,19 @@ getMBlocks(nat n) static char* base_mblocks = (char*)0; static char* next_request = (char*)0; void* ret = (void*)0; - int i; + nat i; lnat size = MBLOCK_SIZE * n; if ( (base_non_committed == 0) || (next_request + size > end_non_committed) ) { if (base_non_committed) { - barf("RTS exhausted max heap size (%d bytes)\n", size_reserved_pool); + /* Tacky, but if no user-provided -M option is in effect, + * set it to the default (==256M) in time for the heap overflow PSA. + */ + if (RtsFlags.GcFlags.maxHeapSize == 0) { + RtsFlags.GcFlags.maxHeapSize = size_reserved_pool / BLOCK_SIZE; + } + heapOverflow(); } if (RtsFlags.GcFlags.maxHeapSize != 0) { size_reserved_pool = BLOCK_SIZE * RtsFlags.GcFlags.maxHeapSize; @@ -285,19 +343,19 @@ getMBlocks(nat n) , PAGE_READWRITE ); if ( base_non_committed == 0 ) { - fprintf(stderr, "getMBlocks: VirtualAlloc failed with: %ld\n", GetLastError()); + errorBelch("getMBlocks: VirtualAlloc failed with: %ld\n", GetLastError()); ret=(void*)-1; } else { end_non_committed = (char*)base_non_committed + (unsigned long)size_reserved_pool; /* The returned pointer is not aligned on a mega-block boundary. Make it. */ base_mblocks = (char*)((unsigned long)base_non_committed & (unsigned long)~MBLOCK_MASK) + MBLOCK_SIZE; # if 0 - fprintf(stderr, "getMBlocks: Dropping %d bytes off of 256M chunk\n", - (unsigned)base_mblocks - (unsigned)base_non_committed); + debugBelch("getMBlocks: Dropping %d bytes off of 256M chunk\n", + (unsigned)base_mblocks - (unsigned)base_non_committed); # endif if ( ((char*)base_mblocks + size) > end_non_committed ) { - fprintf(stderr, "getMBlocks: oops, committed too small a region to start with."); + debugBelch("getMBlocks: oops, committed too small a region to start with."); ret=(void*)-1; } else { next_request = base_mblocks; @@ -308,7 +366,7 @@ getMBlocks(nat n) if ( ret != (void*)-1 ) { ret = VirtualAlloc(next_request, size, MEM_COMMIT, PAGE_READWRITE); if (ret == NULL) { - fprintf(stderr, "getMBlocks: VirtualAlloc failed with: %ld\n", GetLastError()); + debugBelch("getMBlocks: VirtualAlloc failed with: %ld\n", GetLastError()); ret=(void*)-1; } } @@ -321,14 +379,14 @@ getMBlocks(nat n) barf("getMBlocks: unknown memory allocation failure on Win32."); } - IF_DEBUG(gc,fprintf(stderr,"Allocated %d megablock(s) at 0x%x\n",n,(nat)ret)); + IF_DEBUG(gc,debugBelch("Allocated %d megablock(s) at 0x%x\n",n,(nat)ret)); next_request = (char*)next_request + size; mblocks_allocated += n; // fill in the table for (i = 0; i < n; i++) { - MARK_HEAP_ALLOCED ( ret + i * MBLOCK_SIZE ); + markHeapAlloced( ret + i * MBLOCK_SIZE ); } return ret; @@ -350,7 +408,7 @@ freeMBlock(void* p, nat n) if (rc == FALSE) { # ifdef DEBUG - fprintf(stderr, "freeMBlocks: VirtualFree failed with: %d\n", GetLastError()); + debugBelch("freeMBlocks: VirtualFree failed with: %d\n", GetLastError()); # endif }