X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=ghc%2Frts%2FMBlock.c;h=d0ead3fc7d8574d5b92d3b5460c595d5afb1b344;hb=9b588c57cf0d2cb4f360d5155a9b456605c0e8be;hp=2f9655ef4e6f0a00d292804a91152dedce2c92aa;hpb=c7268677eec041516dad5e0b804c393b8e0e9adb;p=ghc-hetmet.git

diff --git a/ghc/rts/MBlock.c b/ghc/rts/MBlock.c
index 2f9655e..d0ead3f 100644
--- a/ghc/rts/MBlock.c
+++ b/ghc/rts/MBlock.c
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: MBlock.c,v 1.45 2003/05/14 09:11:06 simonmar Exp $
+ * $Id: MBlock.c,v 1.50 2003/10/31 16:21:27 sof Exp $
  *
  * (c) The GHC Team 1998-1999
  *
@@ -21,6 +21,9 @@
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
 #endif
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
@@ -91,7 +94,7 @@ 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);
@@ -133,7 +136,7 @@ my_mmap (void *addr, lnat size)
 	    prog_belch("out of memory (requested %d bytes)", size);
 	    stg_exit(EXIT_FAILURE);
 	} else {
-	    barf("getMBlock: mmap: %s", sys_errlist[errno]);
+	    barf("getMBlock: mmap: %s", strerror(errno));
 	}
     }
 
@@ -262,13 +265,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;