X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FStorage.c;h=a657ce8d3e79e1fbaf2f92d8eb7c82efa5bdd4d9;hb=220dec863e89103983698d253c6087d2f85c037f;hp=3594f7197f8e6a1a629afdda8407320780ed66ce;hpb=7b1b3279afe25b4e65ee9ebbafc5e9e38a3b888b;p=ghc-hetmet.git diff --git a/rts/Storage.c b/rts/Storage.c index 3594f71..a657ce8 100644 --- a/rts/Storage.c +++ b/rts/Storage.c @@ -279,6 +279,10 @@ freeStorage (void) stgFree(generations[g].steps); stgFree(generations); freeAllMBlocks(); +#if defined(THREADED_RTS) + closeMutex(&sm_mutex); + closeMutex(&atomic_modify_mutvar_mutex); +#endif } /* ----------------------------------------------------------------------------- @@ -611,7 +615,7 @@ allocate( nat n ) } lnat -allocated_bytes( void ) +allocatedBytes( void ) { lnat allocated; @@ -870,7 +874,7 @@ calcAllocated( void ) nat allocated; bdescr *bd; - allocated = allocated_bytes(); + allocated = allocatedBytes(); allocated += countNurseryBlocks() * BLOCK_SIZE_W; {