{,M}BLOCK_SIZE_W * sizeof(W_) -> {,M}BLOCK_SIZE
authorTomas Carnecky <tomas.carnecky@gmail.com>
Thu, 19 May 2016 19:04:04 +0000 (21:04 +0200)
committerBen Gamari <ben@smart-cactus.org>
Thu, 19 May 2016 19:34:44 +0000 (21:34 +0200)
Reviewers: austin, erikd, simonmar, bgamari

Reviewed By: bgamari

Subscribers: thomie

Differential Revision: https://phabricator.haskell.org/D2241

rts/Stats.c
rts/sm/Storage.c

index cf426ca..30f346e 100644 (file)
@@ -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),
index b505941..717c96a 100644 (file)
@@ -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)