X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FMBlock.c;h=60aa97b036eb57ef98bc17cec9291b371198118f;hb=4bd153f2dd93745183584054e17c6ff169691a49;hp=ceb8856c38e58f84c3f315e0b740b7c03bf70ab5;hpb=3cbaa0c8a6aaad3409b1996c073a4f7464948c2c;p=ghc-hetmet.git diff --git a/ghc/rts/MBlock.c b/ghc/rts/MBlock.c index ceb8856..60aa97b 100644 --- a/ghc/rts/MBlock.c +++ b/ghc/rts/MBlock.c @@ -1,5 +1,4 @@ /* ----------------------------------------------------------------------------- - * $Id: MBlock.c,v 1.43 2003/03/20 15:43:31 simonmar Exp $ * * (c) The GHC Team 1998-1999 * @@ -21,6 +20,9 @@ #ifdef HAVE_STDLIB_H #include #endif +#ifdef HAVE_STRING_H +#include +#endif #ifdef HAVE_UNISTD_H #include #endif @@ -87,11 +89,11 @@ getMBlock(void) // the mmap() interface. static void * -my_mmap (void *addr, int size) +my_mmap (void *addr, lnat size) { void *ret; -#ifdef solaris2_TARGET_OS +#if defined(solaris2_TARGET_OS) || defined(irix_TARGET_OS) { int fd = open("/dev/zero",O_RDONLY); ret = mmap(addr, size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0); @@ -117,7 +119,7 @@ my_mmap (void *addr, int 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 @@ -126,11 +128,14 @@ my_mmap (void *addr, int size) #endif if (ret == (void *)-1) { - if (errno == ENOMEM) { - prog_belch("out of memory (requested %d bytes)", size); + if (errno == ENOMEM || + (errno == EINVAL && sizeof(void*)==4 && size >= 0xc0000000)) { + // If we request more than 3Gig, then we get EINVAL + // instead of ENOMEM (at least on Linux). + errorBelch("out of memory (requested %lu bytes)", size); stg_exit(EXIT_FAILURE); } else { - barf("getMBlock: mmap failed"); + barf("getMBlock: mmap: %s", strerror(errno)); } } @@ -141,7 +146,7 @@ my_mmap (void *addr, int size) // mblocks. static void * -gen_map_mblocks (int size) +gen_map_mblocks (lnat size) { int slop; void *ret; @@ -153,16 +158,25 @@ gen_map_mblocks (int size) // unmap the slop bits around the chunk we allocated slop = (W_)ret & MBLOCK_MASK; - + if (munmap(ret, MBLOCK_SIZE - slop) == -1) { - barf("gen_map_mblocks: munmap failed"); + barf("gen_map_mblocks: munmap failed"); } if (slop > 0 && munmap(ret+size-slop, slop) == -1) { - barf("gen_map_mblocks: munmap failed"); + barf("gen_map_mblocks: munmap failed"); } - + // ToDo: if we happened to get an aligned block, then don't - // unmap the excess, just use it. + // unmap the excess, just use it. For this to work, you + // need to keep in mind the following: + // * Calling my_mmap() with an 'addr' arg pointing to + // already my_mmap()ed space is OK and won't fail. + // * If my_mmap() can't satisfy the request at the + // given 'next_request' address in getMBlocks(), that + // you unmap the extra mblock mmap()ed here (or simply + // satisfy yourself that the slop introduced isn't worth + // salvaging.) + // // next time, try after the block we just got. ret += MBLOCK_SIZE - slop; @@ -190,7 +204,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... @@ -206,7 +220,7 @@ 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++) { @@ -250,13 +264,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; @@ -270,19 +290,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; @@ -293,7 +313,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; } } @@ -306,7 +326,7 @@ 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; @@ -335,7 +355,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 }