X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FMBlock.c;h=f59065ea68f26cfb377bab44ffdf1ece29caa267;hb=b996479a35d1876a1c11a350dc568da7b75fcaf2;hp=95744077b413e555952f5b26768d522ef43e0e25;hpb=a551f1a135addb8e11b5c81bd3f25a3990483383;p=ghc-hetmet.git

diff --git a/ghc/rts/MBlock.c b/ghc/rts/MBlock.c
index 9574407..f59065e 100644
--- a/ghc/rts/MBlock.c
+++ b/ghc/rts/MBlock.c
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: MBlock.c,v 1.41 2002/11/26 07:02:04 mthomas Exp $
+ * $Id: MBlock.c,v 1.46 2003/05/21 13:22:46 stolz Exp $
  *
  * (c) The GHC Team 1998-1999
  *
@@ -87,7 +87,7 @@ getMBlock(void)
 // the mmap() interface.
 
 static void *
-my_mmap (void *addr, int size)
+my_mmap (void *addr, lnat size)
 {
     void *ret;
 
@@ -126,10 +126,14 @@ my_mmap (void *addr, int size)
 #endif
 
     if (ret == (void *)-1) {
-	if (errno == ENOMEM) {
-	    barf("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).
+	    prog_belch("out of memory (requested %d bytes)", size);
+	    stg_exit(EXIT_FAILURE);
 	} else {
-	    barf("getMBlock: mmap failed");
+	    barf("getMBlock: mmap: %s", strerror(errno));
 	}
     }
 
@@ -140,7 +144,7 @@ my_mmap (void *addr, int size)
 // mblocks.
 
 static void *
-gen_map_mblocks (int size)
+gen_map_mblocks (lnat size)
 {
     int slop;
     void *ret;
@@ -152,16 +156,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;
@@ -188,10 +201,10 @@ getMBlocks(nat n)
 
       if (((W_)ret & MBLOCK_MASK) != 0) {
 	  // misaligned block!
-#ifdef DEBUG
+#if 0 // defined(DEBUG)
 	  belch("warning: getMBlock: misaligned block %p returned when allocating %d megablock(s) at %p", ret, n, next_request);
 #endif
-	  
+
 	  // unmap this block...
 	  if (munmap(ret, size) == -1) {
 	      barf("getMBlock: munmap failed");