X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FStorage.c;h=f13f186ec41151c9b5c171361bffb64f280c0c55;hb=e1c4a20eb3545e0ac5c67099e487d1f26d4a655c;hp=b453e658fb2fa8ddb96b552d5acfe5b17c2788a5;hpb=ef1ab86561d6891def5160127b2af2bef27580c2;p=ghc-hetmet.git diff --git a/ghc/rts/Storage.c b/ghc/rts/Storage.c index b453e65..f13f186 100644 --- a/ghc/rts/Storage.c +++ b/ghc/rts/Storage.c @@ -1,5 +1,5 @@ /* ----------------------------------------------------------------------------- - * $Id: Storage.c,v 1.81 2003/10/24 09:52:51 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 @@ -475,6 +475,7 @@ allocate( nat n ) nat req_blocks = (lnat)BLOCK_ROUND_UP(n*sizeof(W_)) / BLOCK_SIZE; bd = allocGroup(req_blocks); dbl_link_onto(bd, &g0s0->large_objects); + g0s0->n_large_blocks += req_blocks; bd->gen_no = 0; bd->step = g0s0; bd->flags = BF_LARGE;