[project @ 2004-07-21 10:47:28 by simonmar]

Make total_allocated be an ullong, to accommodate programs that do a lot
of allocation.

MERGE TO STABLE

diff --git a/ghc/rts/Storage.c b/ghc/rts/Storage.c
index fb0c016..f13f186 100644 (file)
--- a/ghc/rts/Storage.c
+++ b/ghc/rts/Storage.c
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: Storage.c,v 1.82 2003/10/24 09:56:45 simonmar Exp $
+ * $Id: Storage.c,v 1.83 2004/07/21 10:47:28 simonmar Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -44,7 +44,7 @@ generation *g0                = NULL; /* generation 0, for convenience */
 generation *oldest_gen  = NULL; /* oldest generation, for convenience */
 step *g0s0             = NULL; /* generation 0, step 0, for convenience */
 
-lnat total_allocated = 0;      /* total memory allocated during run */
+ullong total_allocated = 0;    /* total memory allocated during run */
 
 /*
  * Storage manager mutex:  protects all the above state from

diff --git a/ghc/rts/StoragePriv.h b/ghc/rts/StoragePriv.h
index 84a8fde..c829e78 100644 (file)
--- a/ghc/rts/StoragePriv.h
+++ b/ghc/rts/StoragePriv.h
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: StoragePriv.h,v 1.25 2003/11/12 17:49:11 sof Exp $
+ * $Id: StoragePriv.h,v 1.26 2004/07/21 10:47:29 simonmar Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -48,7 +48,7 @@ extern bdescr *nursery;
 extern nat alloc_blocks;
 extern nat alloc_blocks_lim;
 
-extern lnat total_allocated;
+extern ullong total_allocated;
 
 /* Nursery manipulation */
 extern void     allocNurseries ( void );