[commit: ghc] master: Simplify the allocation stats accounting (65a0e1e)

[Simon Marlow]

Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/65a0e1eb88fb48d085f8da498a7acc2fd345c2a8

>---------------------------------------------------------------

commit 65a0e1eb88fb48d085f8da498a7acc2fd345c2a8
Author: Simon Marlow <marlowsd at gmail.com>
Date:   Thu Feb 14 10:06:44 2013 +0000

    Simplify the allocation stats accounting
    
    We were doing it in two different ways and asserting that the results
    were the same.  In most cases they were, but I found one case where
    they weren't: the GC itself allocates some memory for running
    finalizers, and this memory was accounted for one way but not the
    other.
    
    It was simpler to remove the old way of counting allocation that to
    try to fix it up, so I did that.

 includes/rts/storage/GC.h |    2 +-
 rts/Stats.c               |   71 ++++++++++++++++++++++++++++-----------------
 rts/Stats.h               |    4 +-
 rts/sm/GC.c               |   33 ++++++--------------
 rts/sm/GCThread.h         |    1 -
 rts/sm/Storage.c          |   30 ++++--------------
 rts/sm/Storage.h          |    4 +-
 7 files changed, 66 insertions(+), 79 deletions(-)


Diff suppressed because of size. To see it, use:

    git show 65a0e1eb88fb48d085f8da498a7acc2fd345c2a8