diff options
| author | Tomas Carnecky <tomas.carnecky@gmail.com> | 2016-05-19 21:04:04 +0200 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2016-05-19 21:34:44 +0200 |
| commit | 464b6f8a2d85285730198fe493ee653e662615d3 (patch) | |
| tree | d4c971300e747834a7a95523bee85a59705c1a7d | |
| parent | 8abc193dd3117adae126d43da3ae04cb045808da (diff) | |
| download | haskell-464b6f8a2d85285730198fe493ee653e662615d3.tar.gz | |
{,M}BLOCK_SIZE_W * sizeof(W_) -> {,M}BLOCK_SIZE
Reviewers: austin, erikd, simonmar, bgamari
Reviewed By: bgamari
Subscribers: thomie
Differential Revision: https://phabricator.haskell.org/D2241
| -rw-r--r-- | rts/Stats.c | 4 | ||||
| -rw-r--r-- | rts/sm/Storage.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/rts/Stats.c b/rts/Stats.c index cf426ca0d3..30f346efee 100644 --- a/rts/Stats.c +++ b/rts/Stats.c @@ -299,7 +299,7 @@ stat_endGC (Capability *cap, gc_thread *gct, slop * sizeof(W_), /* current loss due to fragmentation */ (mblocks_allocated * BLOCKS_PER_MBLOCK - n_alloc_blocks) - * BLOCK_SIZE_W * sizeof(W_), + * BLOCK_SIZE, par_n_threads, par_max_copied * sizeof(W_), par_tot_copied * sizeof(W_)); @@ -355,7 +355,7 @@ stat_endGC (Capability *cap, gc_thread *gct, copied*sizeof(W_), par_max_copied * sizeof(W_), mblocks_allocated * BLOCKS_PER_MBLOCK - * BLOCK_SIZE_W * sizeof(W_), + * BLOCK_SIZE, slop * sizeof(W_), TimeToNS(gc_sync_elapsed), TimeToNS(gc_elapsed), diff --git a/rts/sm/Storage.c b/rts/sm/Storage.c index b50594193c..717c96ae81 100644 --- a/rts/sm/Storage.c +++ b/rts/sm/Storage.c @@ -205,10 +205,10 @@ initStorage (void) traceEventHeapInfo(CAPSET_HEAP_DEFAULT, RtsFlags.GcFlags.generations, - RtsFlags.GcFlags.maxHeapSize * BLOCK_SIZE_W * sizeof(W_), - RtsFlags.GcFlags.minAllocAreaSize * BLOCK_SIZE_W * sizeof(W_), - MBLOCK_SIZE_W * sizeof(W_), - BLOCK_SIZE_W * sizeof(W_)); + RtsFlags.GcFlags.maxHeapSize * BLOCK_SIZE, + RtsFlags.GcFlags.minAllocAreaSize * BLOCK_SIZE, + MBLOCK_SIZE, + BLOCK_SIZE); } void storageAddCapabilities (uint32_t from, uint32_t to) |